diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-06 10:51:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-06 10:51:30 -0700 |
| commit | e38f2a88e56796d13c2a31192bc78ed930b89e54 (patch) | |
| tree | 78368efc3e0f8f7785a3a4d91b55963d08768ab9 /Documentation/RelNotes | |
| parent | Merge branch 'jk/maint-remote-mirror-safer' (diff) | |
| parent | Git 1.7.4.4 (diff) | |
| download | tgif-e38f2a88e56796d13c2a31192bc78ed930b89e54.tar.xz | |
Sync with 1.7.4.4
Diffstat (limited to 'Documentation/RelNotes')
| -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 |