diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-11-07 16:48:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-07 16:48:34 -0800 |
| commit | 4cb6764227173a6483edbdad09121651bc0b01c3 (patch) | |
| tree | cbe1f87b9edecaa3f28bfccaf00927a9d48a1adf | |
| parent | Merge branch 'ss/blame-textconv-fake-working-tree' (diff) | |
| download | tgif-4cb6764227173a6483edbdad09121651bc0b01c3.tar.xz | |
Git 1.7.8-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/1.7.8.txt | 6 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.8.txt b/Documentation/RelNotes/1.7.8.txt index f53845f693..1da562e715 100644 --- a/Documentation/RelNotes/1.7.8.txt +++ b/Documentation/RelNotes/1.7.8.txt @@ -139,6 +139,10 @@ included in this release. credentials. (merge deba493 jk/http-auth later to maint). + * "git blame" was aborted if started from an uncommitted content and + the path had the textconv filter in effect. + (merge 8518088 ss/blame-textconv-fake-working-tree later to maint). + * "git branch -m/-M" advertised to update RENAME_REF ref in the commit log message that introduced the feature but not anywhere in the documentation, and never did update such a ref anyway. This @@ -170,7 +174,7 @@ included in this release. --- exec >/var/tmp/1 -O=v1.7.8-rc0-32-g8e3565f +O=v1.7.8-rc0-48-g92622e6 echo O=$(git describe --always master) git log --first-parent --oneline --reverse ^$O master echo diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 56dc9d6683..cc8a3d27d5 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.8-rc0 +DEF_VER=v1.7.8-rc1 LF=' ' |