Git 1.7.4.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 6, 2011 at 10:49 UTC
5fb41b883a5d0f9cbc4c6c693e6d84a8a5cee17e
3 files changed
+6
-8
Documentation/RelNotes/1.7.4.4.txt
+4
-6
@@ -24,14 +24,12 @@ Fixes since v1.7.4.3
24
fast-forwarding from emptiness to the version being pulled, with
25
the usual protection against overwriting untracked files.
26
27
+ * "git submodule" that is run while a merge in the superproject is in
28
+ conflicted state tried to process each conflicted submodule up to
29
+ three times.
30
+
31
* "git status" spent all the effort to notice racily-clean index entries
32
but didn't update the index file to help later operations go faster in
33
some cases.
34
35
And other minor fixes and documentation updates.
32
-
33
----
34
-exec >/var/tmp/1
35
-O=v1.7.4.3-22-g8c8674f
36
-echo O=$(git describe maint)
37
-git shortlog --no-merges $O..maint
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v1.7.4.3
4
+DEF_VER=v1.7.4.4
5
6
LF='
7
'
RelNotes
+1
-1
@@ -1 +1 @@
1
-Documentation/RelNotes/1.7.4.4
\ No newline at end of file
1
+Documentation/RelNotes/1.7.4.4.txt
\ No newline at end of file