Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Git 1.7.4.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
commit 5fb41b883a5d0f9cbc4c6c693e6d84a8a5cee17e 1 parent 0c41f33
@gitster gitster authored
View
10 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
View
2  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='
'
View
2  RelNotes
Please sign in to comment.
Something went wrong with that request. Please try again.