Skip to content

Commit 9bea2b5

Browse files
committed
Git 1.7.11-rc3
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3a2c135 commit 9bea2b5

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Documentation/RelNotes/1.7.11.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ UI, Workflows & Features
5454
instance of the external tool once per a file pair.
5555

5656
* The "fmt-merge-msg" command learned to list the primary contributors
57-
involved in the side topic you are merging.
57+
involved in the side topic you are merging in a comment in the merge
58+
commit template.
5859

5960
* "git rebase" learned to optionally keep commits that do not
6061
introduce any change in the original history.
@@ -129,6 +130,10 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance
129130
releases are contained in this release (see release notes to them for
130131
details).
131132

133+
* "git fast-export" did not give a readable error message when the
134+
same mark erroneously appeared twice in the --import-marks input.
135+
(merge 43bc230 js/maint-fast-export-mark-error later to maint).
136+
132137
* "git rebase -p" used to pay attention to rebase.autosquash which
133138
was wrong. "git rebase -p -i" should, but "git rebase -p" by
134139
itself should not.

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=v1.7.11-rc2
4+
DEF_VER=v1.7.11-rc3
55

66
LF='
77
'

0 commit comments

Comments
 (0)