Merge branch 'master' into next

* master:
  Git 1.7.8-rc0
This commit is contained in:
Junio C Hamano
2011-10-30 19:17:00 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -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

View File

@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
DEF_VER=v1.7.7.GIT
DEF_VER=v1.7.8-rc0
LF='
'