Git 1.7.11-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jun 12, 2012 at 09:10 UTC
9bea2b5896701cf952f75c8f6756656cd3c40af0
2 files changed
+7
-2
Documentation/RelNotes/1.7.11.txt
+6
-1
@@ -54,7 +54,8 @@ UI, Workflows & Features
54
instance of the external tool once per a file pair.
55
56
* 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.
59
60
* "git rebase" learned to optionally keep commits that do not
61
introduce any change in the original history.
@@ -129,6 +130,10 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance
130
releases are contained in this release (see release notes to them for
131
details).
132
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
+
137
* "git rebase -p" used to pay attention to rebase.autosquash which
138
was wrong. "git rebase -p -i" should, but "git rebase -p" by
139
itself should not.
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v1.7.11-rc2
4
+DEF_VER=v1.7.11-rc3
5
6
LF='
7
'