Git 1.7.4.4

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

diff --git a/Documentation/RelNotes/1.7.4.4.txt b/Documentation/RelNotes/1.7.4.4.txt
index e914904021a31d25bf1c7bd1cf4f7b682bad6588..ff06e04a58c05810b583f11bc66d25b1e965529b 100644 (file)
--- 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
index cbd6e34644aecd77d1421942dda3c049b5221f68..8557ac0c4d4021899841444658b6c2e000855636 100755 (executable)
--- 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
index d5ad5e14a9ea43a1ce7177f08bba115cab339123..211e93c764610c3d2c779ffb7216574328f878fb 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.7.4.4
\ No newline at end of file
+Documentation/RelNotes/1.7.4.4.txt
\ No newline at end of file