diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:13 -0800 |
| commit | 4e0d6207e58fe19be9343395c979bcb92d09b4a9 (patch) | |
| tree | ff9749969b8858c9e37eb8dd343984bd19f1e445 /t/t6038-merge-text-auto.sh | |
| parent | Merge branch 'es/blame-commit-info-fix' into maint (diff) | |
| parent | fast-import: avoid running end_packfile recursively (diff) | |
| download | tgif-4e0d6207e58fe19be9343395c979bcb92d09b4a9.tar.xz | |
Merge branch 'jk/fast-import-die-nicely-fix' into maint
"git fast-import" used to crash when it could not close and
conclude the resulting packfile cleanly.
* jk/fast-import-die-nicely-fix:
fast-import: avoid running end_packfile recursively
Diffstat (limited to 't/t6038-merge-text-auto.sh')
0 files changed, 0 insertions, 0 deletions