From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Jun 2010 16:59:56 +0000 (-0700)
Subject: Git 1.7.1.1
X-Git-Tag: v1.7.1.1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f19df95a7e5cf8c130f1a513b188cad58134e47d;p=git.git

Git 1.7.1.1

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

diff --git a/Documentation/RelNotes-1.7.1.1.txt b/Documentation/RelNotes-1.7.1.1.txt
index 1f94db8bd..3f6b3148a 100644
--- a/Documentation/RelNotes-1.7.1.1.txt
+++ b/Documentation/RelNotes-1.7.1.1.txt
@@ -1,5 +1,5 @@
-Git v1.7.1.1 Release Notes (draft)
-==================================
+Git v1.7.1.1 Release Notes
+==========================
 
 Fixes since v1.7.1
 ------------------
@@ -28,7 +28,7 @@ Fixes since v1.7.1
 
  * After "git apply --whitespace=fix" removed trailing blank lines in an
    patch in a patch series, it failed to apply later patches that depend
-   on the presense of such blank lines.
+   on the presence of such blank lines.
 
  * "git bundle --stdin" segfaulted.
 
@@ -94,10 +94,3 @@ Fixes since v1.7.1
  * "git status" showed excess "hints" even when advice.statusHints is set to false.
 
 And other minor fixes and documentation updates.
-
-
---
-exec >/var/tmp/1
-O=v1.7.1-211-g54fcb21
-echo O=$(git describe HEAD)
-git shortlog --no-merges HEAD ^$O
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 82fd72652..d4cb58e5d 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.1
+DEF_VER=v1.7.1.1
 
 LF='
 '