diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:39 -0700 |
| commit | 8b02ffee3f802989eb74180a907e1d60cfe4a549 (patch) | |
| tree | ef29d56b0dee6afb8ac73b8624fbdd8f2b17312c /mergetools/examdiff | |
| parent | Merge branch 'cb/ci-use-upload-artifacts-v1' into maint (diff) | |
| parent | rebase --continue: remove .git/MERGE_MSG (diff) | |
| download | tgif-8b02ffee3f802989eb74180a907e1d60cfe4a549.tar.xz | |
Merge branch 'pw/rebase-skip-final-fix' into maint
Checking out all the paths from HEAD during the last conflicted
step in "git rebase" and continuing would cause the step to be
skipped (which is expected), but leaves MERGE_MSG file behind in
$GIT_DIR and confuses the next "git commit", which has been
corrected.
* pw/rebase-skip-final-fix:
rebase --continue: remove .git/MERGE_MSG
rebase --apply: restore some tests
t3403: fix commit authorship
Diffstat (limited to 'mergetools/examdiff')
0 files changed, 0 insertions, 0 deletions