git, branch v1.7.6-rc0

Sync with 1.7.5.4

2011-06-01T21:11:17Z

Signed-off-by: Junio C Hamano

Git 1.7.5.4

2011-06-01T21:08:26Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/maint-config-alias-fix' into maint

2011-06-01T21:05:22Z

* 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

Merge branch 'jc/fmt-req-fix' into maint

2011-06-01T21:03:07Z

* jc/fmt-req-fix: userformat_find_requirements(): find requirement for the correct format

Merge branch 'jk/maint-docs' into maint

2011-06-01T21:02:52Z

* 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

Merge branch 'jn/doc-remote-helpers' into maint

2011-06-01T21:02:45Z

* jn/doc-remote-helpers: Documentation: do not misinterpret refspecs as bold text

Merge branch 'kk/maint-prefix-in-config-mak' into maint

2011-06-01T21:02:39Z

* kk/maint-prefix-in-config-mak: config.mak.in: allow "configure --sysconfdir=/else/where"

diffcore-rename.c: avoid set-but-not-used warning

2011-06-01T20:54:17Z

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 Signed-off-by: Junio C Hamano

Update draft release notes to 1.7.6

2011-05-31T19:22:50Z

I think we are almost there for the feature freeze. Signed-off-by: Junio C Hamano

Merge branch 'jk/format-patch-am'

2011-05-31T19:19:11Z

* 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