Merge branch 'master' into next

gitster · gitster · commit bcc18e3fb833 · 2011-10-30T19:17:00.000-07:00
* master:
  Git 1.7.8-rc0
diff --git a/Documentation/RelNotes/1.7.8.txt b/Documentation/RelNotes/1.7.8.txt
@@ -214,7 +214,7 @@ included in this release.
 
 ---
 exec >/var/tmp/1
-O=v1.7.7.1-487-g4801546
+O=v1.7.7.1-492-g324bc2a
 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
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.7.GIT
+DEF_VER=v1.7.8-rc0
 
 LF='
 '
