Git 1.7.4

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

diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt
index 87a60feecf65001abcea665376ae8db7993d0d68..d5bca731b589dde2b8a1edad2977e9376e0ec433 100644 (file)
--- a/Documentation/RelNotes/1.7.4.txt
+++ b/Documentation/RelNotes/1.7.4.txt
@@ -1,5 +1,5 @@
-Git v1.7.4 Release Notes (draft)
-================================
+Git v1.7.4 Release Notes
+========================

 
 Updates since v1.7.3
 --------------------
 
 Updates since v1.7.3
 --------------------


@@ -146,6 +146,9 @@ release, unless otherwise noted.
 
  * "git push --progress" shows progress indicators now.
 
 
  * "git push --progress" shows progress indicators now.
 

+ * "git rebase -i" showed a confusing error message when given a
+   branch name that does not exist.
+

  * "git repack" places its temporary packs under $GIT_OBJECT_DIRECTORY/pack
    instead of $GIT_OBJECT_DIRECTORY/ to avoid cross directory renames.
 
  * "git repack" places its temporary packs under $GIT_OBJECT_DIRECTORY/pack
    instead of $GIT_OBJECT_DIRECTORY/ to avoid cross directory renames.
 

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 0dac7aab573b68e447eebd9102179b309030b62f..e968ed4aa09705d98530add23135e76141ec75c2 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,6 +44,11 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 

+* link:v1.7.4/git.html[documentation for release 1.7.4]
+
+* release notes for
+  link:RelNotes/1.7.4.txt[1.7.4].
+

 * link:v1.7.3.5/git.html[documentation for release 1.7.3.5]
 
 * release notes for
 * link:v1.7.3.5/git.html[documentation for release 1.7.3.5]
 
 * release notes for

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index ccfc298b18439f6463d0c709819402edcec04102..92fe7a59dbf81b0a055280f9351811641ce7044a 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.7.4-rc2
+DEF_VER=v1.7.4

 
 LF='
 '
 
 LF='
 '