git, branch v1.7.10-rc1

Git 1.7.10-rc1

2012-03-14T22:47:45Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/i18n-shell-script-gettext'

2012-03-13T19:36:28Z

The auto detection was testing if a fixed string that is known to be non-empty is empty by mistake. * jc/i18n-shell-script-gettext: i18n: fix auto detection of gettext scheme for shell scripts

Merge branch 'jc/maint-undefined-i18n-observation-test'

2012-03-13T19:36:09Z

It was unclear what a test in t0204 wanted to check; it turns out that it was only to observe an undefined behaviour of the system, and did not anticipate one kind of reasonable error behaviour. * jc/maint-undefined-i18n-observation-test: t0204: clarify the "observe undefined behaviour" test

Merge branch 'ms/maint-config-error-at-eol-linecount'

2012-03-13T19:35:53Z

When "git config" diagnoses an error in a configuration file and shows the line number for the offending line, it miscounted if the error was at the end of line. By Martin Stenberg * ms/maint-config-error-at-eol-linecount: config: report errors at the EOL with correct line number Conflicts: t/t1300-repo-config.sh

Merge branch 'ph/rerere-doc'

2012-03-13T19:35:22Z

By Phil Hord * ph/rerere-doc: rerere: Document 'rerere remaining'

am: officially deprecate -b/--binary option

2012-03-13T19:21:04Z

We have had these options as harmless no-op for more than 3 years without officially deprecating them. Let's announce the deprecation and start warning against their use, but without failing the command just not yet, so that we can later repurpose the option if we want to in the future. Signed-off-by: Junio C Hamano

Update draft release notes to 1.7.10 before -rc1

2012-03-12T22:59:06Z

Signed-off-by: Junio C Hamano

Merge branch 'az/verify-tag-use-gpg-config'

2012-03-12T22:55:54Z

"git tag -s" honored "gpg.program" configuration variable since 1.7.9, but "git tag -v" and "git verify-tag" didn't. By Alex Zepeda * az/verify-tag-use-gpg-config: verify-tag: Parse GPG configuration options.

Sync with 1.7.9.4

2012-03-12T22:54:21Z

Git 1.7.9.4

2012-03-12T22:52:52Z

Signed-off-by: Junio C Hamano