summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-06 17:51:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-06 17:51:30 (GMT)
commite38f2a88e56796d13c2a31192bc78ed930b89e54 (patch)
tree78368efc3e0f8f7785a3a4d91b55963d08768ab9 /Documentation
parentcea667e955cca71e517f259c86bf974d03064df2 (diff)
parent5fb41b883a5d0f9cbc4c6c693e6d84a8a5cee17e (diff)
downloadgit-e38f2a88e56796d13c2a31192bc78ed930b89e54.zip
git-e38f2a88e56796d13c2a31192bc78ed930b89e54.tar.gz
git-e38f2a88e56796d13c2a31192bc78ed930b89e54.tar.bz2
Sync with 1.7.4.4
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.7.4.4.txt10
1 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/RelNotes/1.7.4.4.txt b/Documentation/RelNotes/1.7.4.4.txt
index e914904..ff06e04 100644
--- 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