diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-06 10:49:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-06 10:50:00 -0700 |
| commit | 5fb41b883a5d0f9cbc4c6c693e6d84a8a5cee17e (patch) | |
| tree | 68ef8d3d081fcd82fbb770b9f7fb0a7811cb8527 /Documentation | |
| parent | Merge branch 'nm/maint-conflicted-submodule-entries' into maint (diff) | |
| download | tgif-5fb41b883a5d0f9cbc4c6c693e6d84a8a5cee17e.tar.xz | |
Git 1.7.4.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/1.7.4.4.txt | 10 |
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 e914904021..ff06e04a58 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 |