diff options
| -rw-r--r-- | Documentation/RelNotes/1.7.4.4.txt | 10 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
| l--------- | RelNotes | 2 |
3 files changed, 6 insertions, 8 deletions
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 diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index cbd6e3464..8557ac0c4 100755 --- 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=' ' @@ -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 |