summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes-1.7.1.1.txt13
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 4 insertions, 11 deletions
diff --git a/Documentation/RelNotes-1.7.1.1.txt b/Documentation/RelNotes-1.7.1.1.txt
index 1f94db8bdd..3f6b3148a3 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 82fd72652b..d4cb58e5df 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='
'