From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 11 Apr 2010 20:44:17 +0000 (-0700)
Subject: Sync with 1.7.0.5
X-Git-Tag: v1.7.1-rc2~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7b575f3c387f7fd1b204af71a02b3faa74fb7798;p=git.git

Sync with 1.7.0.5
---

7b575f3c387f7fd1b204af71a02b3faa74fb7798
diff --cc GIT-VERSION-GEN
index 3eb6d8517,6705b1048..e5b1111a3
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
- DEF_VER=v1.7.0.4
 -DEF_VER=v1.7.0.5
++DEF_VER=v1.7.1.rc1.GIT
  
  LF='
  '