Merge branch 'master' into next

* master:
  Git 1.7.5-rc0
This commit is contained in:
Junio C Hamano
2011-03-31 13:59:12 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -135,6 +135,6 @@ release, unless otherwise noted.
---
exec >/var/tmp/1
O=v1.7.4.2-405-gbf0c5bb
O=v1.7.5-rc0
echo O=$(git describe 'master')
git shortlog --no-merges ^maint ^$O master

View File

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