X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2FRelNotes%2F1.7.4.4.txt;h=ff06e04a58c05810b583f11bc66d25b1e965529b;hb=bc50897b90177f03c74e53467d1b62aec74789c5;hp=e914904021a31d25bf1c7bd1cf4f7b682bad6588;hpb=1eb71bc0ec609c67b8a308f9267691144a48bffd;p=git.git

diff --git a/Documentation/RelNotes/1.7.4.4.txt b/Documentation/RelNotes/1.7.4.4.txt
index e91490402..ff06e04a5 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