Skip to content

Commit 2632c89

Browse files
committed
Git 2.10-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 83d9eb0 commit 2632c89

File tree

2 files changed

+32
-1
lines changed

2 files changed

+32
-1
lines changed

Documentation/RelNotes/2.10.0.txt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,15 @@ UI, Workflows & Features
118118
"git branch --delete/--move [--remote]".
119119
(merge 2703c22 vs/completion-branch-fully-spelled-d-m-r later to maint).
120120

121+
* "git rev-parse --git-path hooks/<hook>" learned to take
122+
core.hooksPath configuration variable (introduced during 2.9 cycle)
123+
into account.
124+
(merge 9445b49 ab/hooks later to maint).
125+
126+
* "git log --show-signature" and other commands that display the
127+
verification status of PGP signature now shows the longer key-id,
128+
as 32-bit key-id is so last century.
129+
121130

122131
Performance, Internal Implementation, Development Support etc.
123132

@@ -600,6 +609,28 @@ notes for details).
600609
arises).
601610
(merge c2cafd3 js/test-lint-pathname later to maint).
602611

612+
* When "git merge-recursive" works on history with many criss-cross
613+
merges in "verbose" mode, the names the command assigns to the
614+
virtual merge bases could have overwritten each other by unintended
615+
reuse of the same piece of memory.
616+
(merge 5447a76 rs/pull-signed-tag later to maint).
617+
618+
* "git checkout --detach <branch>" used to give the same advice
619+
message as that is issued when "git checkout <tag>" (or anything
620+
that is not a branch name) is given, but asking with "--detach" is
621+
an explicit enough sign that the user knows what is going on. The
622+
advice message has been squelched in this case.
623+
(merge 779b88a sb/checkout-explit-detach-no-advice later to maint).
624+
625+
* "git difftool" by default ignores the error exit from the backend
626+
commands it spawns, because often they signal that they found
627+
differences by exiting with a non-zero status code just like "diff"
628+
does; the exit status codes 126 and above however are special in
629+
that they are used to signal that the command is not executable,
630+
does not exist, or killed by a signal. "git difftool" has been
631+
taught to notice these exit status codes.
632+
(merge 45a4f5d jk/difftool-command-not-found later to maint).
633+
603634
* Other minor clean-ups and documentation updates
604635
(merge 02a8cfa rs/merge-add-strategies-simplification later to maint).
605636
(merge af4941d rs/merge-recursive-string-list-init later to maint).

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
GVF=GIT-VERSION-FILE
4-
DEF_VER=v2.10.0-rc0
4+
DEF_VER=v2.10.0-rc1
55

66
LF='
77
'

0 commit comments

Comments
 (0)