Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Sync with 1.7.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.6-rc0
Junio C Hamano
Git 1.7.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.5.4
Junio C Hamano
Merge branch 'jk/maint-config-alias-fix' into maint * jk/maint-config-alias-fix: handle_options(): do not miscount how many arguments were used config: always parse GIT_CONFIG_PARAMETERS during git_config git_config: don't peek at global config_parameters config: make environment parsing routines static
Junio C Hamano
Merge branch 'jc/fmt-req-fix' into maint * jc/fmt-req-fix: userformat_find_requirements(): find requirement for the correct format
Junio C Hamano
Merge branch 'jk/maint-docs' into maint * jk/maint-docs: docs: fix some antique example output docs: make sure literal "->" isn't converted to arrow docs: update status --porcelain format docs: minor grammar fixes to git-status
Junio C Hamano
Merge branch 'jn/doc-remote-helpers' into maint * jn/doc-remote-helpers: Documentation: do not misinterpret refspecs as bold text
Junio C Hamano
Merge branch 'kk/maint-prefix-in-config-mak' into maint * kk/maint-prefix-in-config-mak: config.mak.in: allow "configure --sysconfdir=/else/where"
Jim Meyering
diffcore-rename.c: avoid set-but-not-used warning Since 9d8a5a5 (diffcore-rename: refactor "too many candidates" logic, 2011-01-06), diffcore_rename() initializes num_src but does not use it anymore. "-Wunused-but-set-variable" in gcc-4.6 complains about this. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes to 1.7.6 I think we are almost there for the feature freeze. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jk/format-patch-am' * jk/format-patch-am: format-patch: preserve subject newlines with -k clean up calling conventions for pretty.c functions pretty: add pp_commit_easy function for simple callers mailinfo: always clean up rfc822 header folding t: test subject handling in format-patch / am pipeline Conflicts: builtin/branch.c builtin/log.c commit.h
Junio C Hamano
Merge branch 'jn/doc-remote-helpers' * jn/doc-remote-helpers: Documentation: do not misinterpret refspecs as bold text
Junio C Hamano
Merge branch 'jk/format-patch-empty-prefix' * jk/format-patch-empty-prefix: format-patch: make zero-length subject prefixes prettier
Junio C Hamano
Merge branch 'ab/i18n-envsubst-doc-fix' * ab/i18n-envsubst-doc-fix: git-sh-i18n--envsubst: add SYNOPSIS section to the documentation
Junio C Hamano
Merge branch 'jc/log-quiet-fix' * jc/log-quiet-fix: log: --quiet should serve as synonym to -s
Junio C Hamano
Merge branch 'kk/maint-prefix-in-config-mak' * kk/maint-prefix-in-config-mak: config.mak.in: allow "configure --sysconfdir=/else/where"
Junio C Hamano
Merge branch 'jk/rebase-head-reflog' * jk/rebase-head-reflog: rebase: write a reflog entry when finishing rebase: create HEAD reflog entry when aborting
Junio C Hamano
Merge branch 'jk/maint-docs' * jk/maint-docs: docs: fix some antique example output docs: make sure literal "->" isn't converted to arrow docs: update status --porcelain format docs: minor grammar fixes to git-status
Junio C Hamano
Merge branch 'jk/read-in-full-stops-on-error' * jk/read-in-full-stops-on-error: read_in_full: always report errors
Junio C Hamano
Merge branch 'jk/maint-remote-mirror-safer' * jk/maint-remote-mirror-safer: remote: allow "-t" with fetch mirrors
Junio C Hamano
Merge branch 'jl/read-tree-m-dry-run' * jl/read-tree-m-dry-run: Teach read-tree the -n|--dry-run option unpack-trees: add the dry_run flag to unpack_trees_options
Junio C Hamano
Sync with maint
Junio C Hamano
Start 1.7.5.4 draft release notes Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'tr/add-i-no-escape' into maint * tr/add-i-no-escape: add -i: ignore terminal escape sequences
Junio C Hamano
Merge branch 'vh/config-interactive-singlekey-doc' into maint * vh/config-interactive-singlekey-doc: git-reset.txt: better docs for '--patch' git-checkout.txt: better docs for '--patch' git-stash.txt: better docs for '--patch' git-add.txt: document 'interactive.singlekey' config.txt: 'interactive.singlekey; is used by...
Junio C Hamano
Merge branch 'ml/test-readme' into maint * ml/test-readme: t/README: unify documentation of test function args
Junio C Hamano
Merge branch 'ab/i18n-fixup' into maint * ab/i18n-fixup: (24 commits) i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 i18n: use test_i18n{grep,cmp} in t7508 i18n: use test_i18ngrep in t7506 i18n: use test_i18ngrep and test_i18ncmp in t7502 i18n: use test_i18ngrep in t7501 i18n: use test_i18ncmp in t7500 i18n: use test_i18ngrep in t7201 i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110 i18n: use…
Junio C Hamano
Merge branch 'jc/rename-degrade-cc-to-c' into maint * jc/rename-degrade-cc-to-c: diffcore-rename: fall back to -C when -C -C busts the rename limit diffcore-rename: record filepair for rename src diffcore-rename: refactor "too many candidates" logic builtin/diff.c: remove duplicated call to diff_result_code()
Junio C Hamano
Merge branch 'rr/doc-content-type' into maint * rr/doc-content-type: Documentation: Allow custom diff tools to be specified in 'diff.tool' Documentation: Add diff.<driver>.* to config Documentation: Move diff.<driver>.* from config.txt to diff-config.txt Documentation: Add filter.<driver>.* to config
Ramsay Jones
config.c: Remove unused git_config_global() function Commit 8f323c00 (drop support for GIT_CONFIG_NOGLOBAL, 15-03-2011) removed the git_config_global() function, among other things, since it is no longer required. Unfortunately, this function has since been unintentionally restored by a faulty conflict resolution. Remove it. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/fmt-req-fix' * jc/fmt-req-fix: userformat_find_requirements(): find requirement for the correct format
  1. Prev
  2. Next