diff options
| -rw-r--r-- | Documentation/RelNotes/1.7.12.txt | 12 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.12.txt b/Documentation/RelNotes/1.7.12.txt index eddef23c7..f86e537e4 100644 --- a/Documentation/RelNotes/1.7.12.txt +++ b/Documentation/RelNotes/1.7.12.txt @@ -77,6 +77,10 @@ UI, Workflows & Features a separate "git prompting" script, to help lazy-autoloading of the completion part while making prompting part always available. + * "gitweb" pays attention to various forms of credits that are + similar to "Signed-off-by:" lines in the commit objects and + highlights them accordingly. + Foreign Interface @@ -124,6 +128,14 @@ Unless otherwise noted, all the fixes since v1.7.11 in the maintenance releases are contained in this release (see release notes to them for details). + * "git commit-tree" learned a more natural "-p <parent> <tree>" order + of arguments long time ago, but recently forgot it by mistake. + (merge 4b7518a kk/maint-commit-tree later to maint). + + * "git diff --no-ext-diff" did not output anything for a typechange + filepair when GIT_EXTERNAL_DIFF is in effect. + (merge c12f82a jv/maint-no-ext-diff later to maint). + * When "git am" failed, old timers knew to check .git/rebase-apply/patch to see what went wrong, but we never told the users about it. (merge 14bf2d5 pg/maint-1.7.9-am-where-is-patch later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index fde74a68d..22bb2298a 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.11.GIT +DEF_VER=v1.7.12-rc0 LF=' ' |