mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Git 2.10-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
83d9eb0ad8
commit
2632c897f7
|
@ -118,6 +118,15 @@ UI, Workflows & Features
|
|||
"git branch --delete/--move [--remote]".
|
||||
(merge 2703c22 vs/completion-branch-fully-spelled-d-m-r later to maint).
|
||||
|
||||
* "git rev-parse --git-path hooks/<hook>" learned to take
|
||||
core.hooksPath configuration variable (introduced during 2.9 cycle)
|
||||
into account.
|
||||
(merge 9445b49 ab/hooks later to maint).
|
||||
|
||||
* "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.
|
||||
|
||||
|
||||
Performance, Internal Implementation, Development Support etc.
|
||||
|
||||
|
@ -600,6 +609,28 @@ notes for details).
|
|||
arises).
|
||||
(merge c2cafd3 js/test-lint-pathname later to maint).
|
||||
|
||||
* 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.
|
||||
(merge 5447a76 rs/pull-signed-tag later to maint).
|
||||
|
||||
* "git checkout --detach <branch>" used to give the same advice
|
||||
message as that is issued when "git checkout <tag>" (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.
|
||||
(merge 779b88a sb/checkout-explit-detach-no-advice later to maint).
|
||||
|
||||
* "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.
|
||||
(merge 45a4f5d jk/difftool-command-not-found later to maint).
|
||||
|
||||
* Other minor clean-ups and documentation updates
|
||||
(merge 02a8cfa rs/merge-add-strategies-simplification later to maint).
|
||||
(merge af4941d rs/merge-recursive-string-list-init later to maint).
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
GVF=GIT-VERSION-FILE
|
||||
DEF_VER=v2.10.0-rc0
|
||||
DEF_VER=v2.10.0-rc1
|
||||
|
||||
LF='
|
||||
'
|
||||
|
|
Loading…
Reference in a new issue