Git 1.7.11-rc3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-06-12 09:10:52 -07:00
parent 3a2c13551e
commit 9bea2b5896
2 changed files with 7 additions and 2 deletions

View file

@ -54,7 +54,8 @@ UI, Workflows & Features
instance of the external tool once per a file pair.
* The "fmt-merge-msg" command learned to list the primary contributors
involved in the side topic you are merging.
involved in the side topic you are merging in a comment in the merge
commit template.
* "git rebase" learned to optionally keep commits that do not
introduce any change in the original history.
@ -129,6 +130,10 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance
releases are contained in this release (see release notes to them for
details).
* "git fast-export" did not give a readable error message when the
same mark erroneously appeared twice in the --import-marks input.
(merge 43bc230 js/maint-fast-export-mark-error later to maint).
* "git rebase -p" used to pay attention to rebase.autosquash which
was wrong. "git rebase -p -i" should, but "git rebase -p" by
itself should not.

View file

@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
DEF_VER=v1.7.11-rc2
DEF_VER=v1.7.11-rc3
LF='
'