git, branch v2.10.0-rc1

Git 2.10-rc1

2016-08-19T22:39:33Z

Signed-off-by: Junio C Hamano

Merge branch 'lt/gpg-show-long-key-in-signature-verification'

2016-08-19T22:34:16Z

"git log --show-signature" and other commands that display the verification status of PGP signature now shows the longer key-id, as 32-bit key-id is so last century. * lt/gpg-show-long-key-in-signature-verification: gpg-interface: prefer "long" key format output when verifying pgp signatures

Merge branch 'ab/hooks'

2016-08-19T22:34:16Z

"git rev-parse --git-path hooks/" learned to take core.hooksPath configuration variable (introduced during 2.9 cycle) into account. * ab/hooks: rev-parse: respect core.hooksPath in --git-path

Merge branch 'jk/difftool-command-not-found'

2016-08-19T22:34:15Z

"git difftool" by default ignores the error exit from the backend commands it spawns, because often they signal that they found differences by exiting with a non-zero status code just like "diff" does; the exit status codes 126 and above however are special in that they are used to signal that the command is not executable, does not exist, or killed by a signal. "git difftool" has been taught to notice these exit status codes. * jk/difftool-command-not-found: difftool: always honor fatal error exit codes

Merge branch 'sb/checkout-explit-detach-no-advice'

2016-08-19T22:34:15Z

"git checkout --detach " used to give the same advice message as that is issued when "git checkout " (or anything that is not a branch name) is given, but asking with "--detach" is an explicit enough sign that the user knows what is going on. The advice message has been squelched in this case. * sb/checkout-explit-detach-no-advice: checkout: do not mention detach advice for explicit --detach option

Merge branch 'tb/t0027-raciness-fix'

2016-08-19T22:34:14Z

The t0027 test for CRLF conversion was timing dependent and flaky. * tb/t0027-raciness-fix: convert: Correct NNO tests and missing `LF will be replaced by CRLF`

Merge branch 'rs/pull-signed-tag'

2016-08-19T22:34:14Z

When "git merge-recursive" works on history with many criss-cross merges in "verbose" mode, the names the command assigns to the virtual merge bases could have overwritten each other by unintended reuse of the same piece of memory. * rs/pull-signed-tag: commit: use FLEX_ARRAY in struct merge_remote_desc merge-recursive: fix verbose output for multiple base trees commit: factor out set_merge_remote_desc() commit: use xstrdup() in get_merge_parent()

RelNotes: final batch of topics before -rc1

2016-08-17T21:09:17Z

Merge branch 'js/test-lint-pathname'

2016-08-17T21:07:48Z

The "t/" hierarchy is prone to get an unusual pathname; "make test" has been taught to make sure they do not contain paths that cannot be checked out on Windows (and the mechanism can be reusable to catch pathnames that are not portable to other platforms as need arises). * js/test-lint-pathname: t/Makefile: ensure that paths are valid on platforms we care

Merge branch 'sg/reflog-past-root'

2016-08-17T21:07:48Z

A small test clean-up for a topic introduced in v2.9.1 and later. * sg/reflog-past-root: t1410: remove superfluous 'git reflog' from the 'walk past root' test