git, branch v2.11.0-rc3

Git 2.11-rc3

2016-11-23T19:24:59Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/setup-cleanup-fix'

2016-11-23T19:23:17Z

"git archive" and "git mailinfo" stopped reading from local configuration file with a recent update. * jc/setup-cleanup-fix: archive: read local configuration mailinfo: read local configuration

Merge branch 'jt/trailer-with-cruft'

2016-11-23T19:23:17Z

Doc update. * jt/trailer-with-cruft: doc: mention user-configured trailers

Merge branch 'js/rebase-i-commentchar-fix'

2016-11-23T19:23:17Z

"git rebase -i" did not work well with core.commentchar configuration variable for two reasons, both of which have been fixed. * js/rebase-i-commentchar-fix: rebase -i: handle core.commentChar=auto stripspace: respect repository config rebase -i: highlight problems with core.commentchar

Merge branch 'jc/for-each-ref-head-segfault-fix'

2016-11-23T19:23:16Z

Using a %(HEAD) placeholder in "for-each-ref --format=" option caused the command to segfault when on an unborn branch. * jc/for-each-ref-head-segfault-fix: for-each-ref: do not segv with %(HEAD) on an unborn branch

Merge tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-po

2016-11-22T22:16:06Z

l10n-2.11.0-rnd2 * tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-po: l10n: Fixed typo of git fetch-pack command l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed) l10n: zh_CN: for git v2.11.0 l10n round 1 l10n: pt_PT: update Portuguese translation l10n: fr.po fix grammar mistakes l10n: fr.po v2.11.0_rnd1 l10n: sv.po: Update Swedish translation (2913t0f0u) l10n: vi.po: Updated translation to v2.11.0 (2913t) l10n: ko.po: Update Korean translation l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed) l10n: ru.po: update Russian translation

Merge branch 'js/prepare-sequencer'

2016-11-22T22:15:38Z

Fix for an error message string. * js/prepare-sequencer: i18n: fix unmatched single quote in error message

archive: read local configuration

2016-11-22T21:55:20Z

Since b9605bc4f2 ("config: only read .git/config from configured repos", 2016-09-12), we do not read from ".git/config" unless we know we are in a repository. "git archive" however didn't do the repository discovery and instead relied on the old behaviour. Teach the command to run a "gentle" version of repository discovery so that local configuration variables are honoured. [jc: stole tests from peff] Signed-off-by: Junio C Hamano

mailinfo: read local configuration

2016-11-22T21:13:16Z

Since b9605bc4f2 ("config: only read .git/config from configured repos", 2016-09-12), we do not read from ".git/config" unless we know we are in a repository. "git mailinfo" however didn't do the repository discovery and instead relied on the old behaviour. This was mostly OK because it was merely run as a helper program by other porcelain scripts that first chdir's up to the root of the working tree. Teach the command to run a "gentle" version of repository discovery so that local configuration variables like mailinfo.scissors are honoured. Signed-off-by: Junio C Hamano

l10n: Fixed typo of git fetch-pack command

2016-11-22T14:24:59Z

Git 2.11.0-rc2 introduced one small l10n update, and this commit fixed the affected translations all in one batch. Signed-off-by: Jiang Xin