diff options
| -rw-r--r-- | Documentation/RelNotes/1.7.11.txt | 7 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.11.txt b/Documentation/RelNotes/1.7.11.txt index a1f7994cec..a9fa44919f 100644 --- 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 - 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. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index a1f935e2b7..728a5d4d29 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.11-rc2 +DEF_VER=v1.7.11-rc3 LF=' ' |