Skip to content

Commit 8a0ba68

Browse files
committed
Git 2.20-rc2
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 15cc2da commit 8a0ba68

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

Documentation/RelNotes/2.20.0.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,22 @@ Fixes since v2.19
639639
adjusted for shared repository settings. This was made consistent.
640640
(merge c9d6c78870 cc/shared-index-permbits later to maint).
641641

642+
* "git rebase --stat" to transplant a piece of history onto a totally
643+
unrelated history were not working before and silently showed wrong
644+
result. With the recent reimplementation in C, it started to instead
645+
die with an error message, as the original logic was not prepared
646+
to cope with this case. This has now been fixed.
647+
648+
* The advice message to tell the user to migrate an existing graft
649+
file to the replace system when a graft file was read was shown
650+
even when "git replace --convert-graft-file" command, which is the
651+
way the message suggests to use, was running, which made little
652+
sense.
653+
(merge 8821e90a09 ab/replace-graft-with-replace-advice later to maint).
654+
655+
* "git diff --raw" lost ellipses to adjust the output columns for
656+
some time now, but the documentation still showed them.
657+
642658
* Code cleanup, docfix, build fix, etc.
643659
(merge 96a7501aad ts/doc-build-manpage-xsl-quietly later to maint).
644660
(merge b9b07efdb2 tg/conflict-marker-size later to maint).
@@ -679,3 +695,6 @@ Fixes since v2.19
679695
(merge 8c64bc9420 sg/test-rebase-editor-fix later to maint).
680696
(merge 71571cd7d6 ma/sequencer-do-reset-saner-loop-termination later to maint).
681697
(merge 9a4cb8781e cb/notes-freeing-always-null-fix later to maint).
698+
(merge 3006f5ee16 ma/reset-doc-rendering-fix later to maint).
699+
(merge 4c2eb06419 sg/daemon-test-signal-fix later to maint).
700+
(merge d27525e519 ss/msvc-strcasecmp 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.20.0-rc1
4+
DEF_VER=v2.20.0-rc2
55

66
LF='
77
'

0 commit comments

Comments
 (0)