diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:24 -0700 |
| commit | 3ecca8879a07889884dcdc90066c76c4e948856a (patch) | |
| tree | 9e6e98735ea13af60f756cfc8c18c842c7c1327d /t/t8004-blame-with-conflicts.sh | |
| parent | Merge branch 'kn/tag-doc-fix' (diff) | |
| parent | fast-import: do less work when given "from" matches current branch head (diff) | |
| download | tgif-3ecca8879a07889884dcdc90066c76c4e948856a.tar.xz | |
Merge branch 'mh/fast-import-optimize-current-from'
Often a fast-import stream builds a new commit on top of the
previous commit it built, and it often unconditionally emits a
"from" command to specify the first parent, which can be omitted in
such a case. This caused fast-import to forget the tree of the
previous commit and then re-read it from scratch, which was
inefficient. Optimize for this common case.
* mh/fast-import-optimize-current-from:
fast-import: do less work when given "from" matches current branch head
Diffstat (limited to 't/t8004-blame-with-conflicts.sh')
0 files changed, 0 insertions, 0 deletions