From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 30 Jan 2011 19:53:13 +0000 (-0800)
Subject: Git 1.7.4
X-Git-Tag: ko-master
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7ed863a85a6ce2c4ac4476848310b8f917ab41f9;p=git.git

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 87a60feec..d5bca731b 100644
--- 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
 --------------------
@@ -146,6 +146,9 @@ release, unless otherwise noted.
 
  * "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.
 
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 0dac7aab5..e968ed4aa 100644
--- 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:
 
+* 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
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index ccfc298b1..92fe7a59d 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.4-rc2
+DEF_VER=v1.7.4
 
 LF='
 '