Git 1.7.8-rc1

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

diff --git a/Documentation/RelNotes/1.7.8.txt b/Documentation/RelNotes/1.7.8.txt
index f53845f693b33124bbb8f10b5569822caf8256bf..1da562e715d1cf26f13ee61882af081d481621f5 100644 (file)
--- 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).
 
    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
  * "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
 
 ---
 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
 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 56dc9d66838c3767852da420b1eeaf6ee4ceb1c4..cc8a3d27d5a50ee9388b2eacabb5ebbbc0300f0e 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.8-rc0
+DEF_VER=v1.7.8-rc1

 
 LF='
 '
 
 LF='
 '