From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 3 Apr 2011 07:12:31 +0000 (-0700)
Subject: Git 1.7.4.3
X-Git-Tag: v1.7.4.3^0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d83a831bf4eca748f159b326d5a2562085013900;p=git.git

Git 1.7.4.3

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

diff --git a/Documentation/RelNotes/1.7.4.3.txt b/Documentation/RelNotes/1.7.4.3.txt
new file mode 100644
index 000000000..02a3d5bdf
--- /dev/null
+++ b/Documentation/RelNotes/1.7.4.3.txt
@@ -0,0 +1,32 @@
+Git v1.7.4.3 Release Notes
+==========================
+
+Fixes since v1.7.4.2
+--------------------
+
+ * "git apply" used to confuse lines updated by previous hunks as lines
+   that existed before when applying a hunk, contributing misapplication
+   of patches with offsets.
+
+ * "git branch --track" (and "git checkout --track --branch") used to
+   allow setting up a random non-branch that does not make sense to follow
+   as the "upstream".  The command correctly diagnoses it as an error.
+
+ * "git checkout $other_branch" silently removed untracked symbolic links
+   in the working tree that are in the way in order to check out paths
+   under it from the named branch.
+
+ * "git cvsimport" did not bail out immediately when the cvs server cannot
+   be reached, spewing unnecessary error messages that complain about the
+   server response that it never got.
+
+ * "git diff --quiet" did not work very well with the "--diff-filter"
+   option.
+
+ * "git grep -n" lacked a long-hand synonym --line-number.
+
+ * "git stash apply" reported the result of its operation by running
+   "git status" from the top-level of the working tree; it should (and
+   now does) run it from the user's working directory.
+
+And other minor fixes and documentation updates.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 0b4e960d9..cbd6e3464 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.4.2
+DEF_VER=v1.7.4.3
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 9a7495512..5d988d6ab 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.7.4.2.txt
\ No newline at end of file
+Documentation/RelNotes/1.7.4.3.txt
\ No newline at end of file