diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-31 12:40:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-31 12:40:53 -0700 |
| commit | bc4b9247df12e668b93cca85d6a5415e6b007368 (patch) | |
| tree | 8fe06b21d28f00c5a1fdd0d3b95b937f396ef6c8 /t/t6037-merge-ours-theirs.sh | |
| parent | Final batch before 2.9-rc1 (diff) | |
| parent | fast-import: do not truncate exported marks file (diff) | |
| download | tgif-bc4b9247df12e668b93cca85d6a5415e6b007368.tar.xz | |
Merge branch 'fc/fast-import-broken-marks-file'
"git fast-import --export-marks" would overwrite the existing marks
file even when it makes a dump from its custom die routine.
Prevent it from doing so when we have an import-marks file but
haven't finished reading it.
* fc/fast-import-broken-marks-file:
fast-import: do not truncate exported marks file
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions