Git 1.7.11-rc3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/1.7.11.txt b/Documentation/RelNotes/1.7.11.txt
index a1f7994cec3ffa97cc81bf88236ce7d0f9621349..a9fa44919fa9c6fd997c56f6f33114d1fa18e895 100644 (file)
--- a/Documentation/RelNotes/1.7.11.txt
+++ b/Documentation/RelNotes/1.7.11.txt
@@ -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
    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.
 
  * "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).
 
 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.
  * "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.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index a1f935e2b70d7b7805bf4832046356259551235f..728a5d4d290d9c503bf0db72bbc40656ec815a2b 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.7.11-rc2
+DEF_VER=v1.7.11-rc3

 
 LF='
 '
 
 LF='
 '