git/builtin, branch v2.6.0

Merge branch 'ah/show-ref-usage-string'

2015-09-14T21:59:06Z

Both "git show-ref -h" and "git show-ref --help" illustrated that the "--exclude-existing" option makes the command read list of refs from its standard input. Change only the "show-ref -h" output to have a pair of "<>" around the placeholder that designate an input file, i.e. "git show-ref --exclude-existing < ". * ah/show-ref-usage-string: show-ref: place angle brackets around variables in usage string

Merge branch 'rt/help-strings-fix'

2015-09-14T21:59:04Z

* rt/help-strings-fix: tag, update-ref: improve description of option "create-reflog" pull: don't mark values for option "rebase" for translation

Merge branch 'gb/apply-comment-typofix'

2015-09-14T18:44:44Z

* gb/apply-comment-typofix: apply: comment grammar fix

tag, update-ref: improve description of option "create-reflog"

2015-09-11T16:50:02Z

The description of option "create-reflog" is "create_reflog", which is neither a good description, nor a sensible string to translate. Change it to a more meaningful message. Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano

pull: don't mark values for option "rebase" for translation

2015-09-11T16:50:00Z

"false|true|preserve" are actual values for option "rebase" of the "git-pull" command and should therefore not be marked for translation. Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano

Sync with 2.5.2

2015-09-09T21:30:35Z

Merge branch 'jc/builtin-am-signoff-regression-fix'

2015-09-08T22:35:05Z

Recent "git am" had regression when adding a Signed-off-by line with its "-s" option by an unintended tightening of how an existing trailer block is detected. * jc/builtin-am-signoff-regression-fix: am: match --signoff to the original scripted version

am: match --signoff to the original scripted version

2015-09-07T02:59:40Z

Linus noticed that the recently reimplemented "git am -s" defines the trailer block too rigidly, resulting in an unnecessary blank line between the existing sign-offs and his new sign-off. An e-mail submission sent to Linus in real life ends with mixture of sign-offs and commentaries, e.g. title here message here Signed-off-by: Original Author [rv: tweaked frotz and nitfol] Signed-off-by: Re Viewer Signed-off-by: Other Reviewer --- patch here Because the reimplementation reused append_signoff() helper that is used by other codepaths, which is unaware that people intermix such comments with their sign-offs in the trailer block, such a message was judged to end with a non-trailer, resulting in an extra blank line before adding a new sign-off. The original scripted version of "git am" used a lot looser definition, i.e. "if and only if there is no line that begins with Signed-off-by:, add a blank line before adding a new sign-off". For the upcoming release, stop using the append_signoff() in "git am" and reimplement the looser definition used by the scripted version to use only in "git am" to fix this regression in "am" while avoiding new regressions to other users of append_signoff(). In the longer term, we should look into loosening append_signoff() so that other codepaths that add a new sign-off behave the same way as "git am -s", but that is a task for post-release. Reported-by: Linus Torvalds Signed-off-by: Junio C Hamano

Sync with 2.4.9

2015-09-04T17:43:23Z

Sync with 2.3.9

2015-09-04T17:34:19Z