Git 1.7.4.4

Signed-off-by: Junio C Hamano <[email protected]>
gjbianco · Apr 6, 2011 · 5fb41b8 · 5fb41b8
1 parent 0c41f33
commit 5fb41b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/Documentation/RelNotes/1.7.4.4.txt b/Documentation/RelNotes/1.7.4.4.txt
@@ -24,14 +24,12 @@ Fixes since v1.7.4.3
    fast-forwarding from emptiness to the version being pulled, with
    the usual protection against overwriting untracked files.
 
+ * "git submodule" that is run while a merge in the superproject is in
+   conflicted state tried to process each conflicted submodule up to
+   three times.
+
  * "git status" spent all the effort to notice racily-clean index entries
    but didn't update the index file to help later operations go faster in
    some cases.
 
 And other minor fixes and documentation updates.
-
----
-exec >/var/tmp/1
-O=v1.7.4.3-22-g8c8674f
-echo O=$(git describe maint)
-git shortlog --no-merges $O..maint
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.4.3
+DEF_VER=v1.7.4.4
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.7.4.4
+Documentation/RelNotes/1.7.4.4.txt
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Documentation/RelNotes/1.7.4.4
		Documentation/RelNotes/1.7.4.4.txt