diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-09-14 11:17:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-14 11:17:00 -0700 |
| commit | b995e78147d0ec6bf3af4a7c31e41535409102da (patch) | |
| tree | 464937feb54051bad29d9ae8f64ccb33a00570f1 /diff.c | |
| parent | Merge branch 'ob/revert-of-revert-is-reapply' (diff) | |
| parent | rebase -i: fix adding failed command to the todo list (diff) | |
| download | git-b995e78147d0ec6bf3af4a7c31e41535409102da.tar.gz git-b995e78147d0ec6bf3af4a7c31e41535409102da.zip | |
Merge branch 'pw/rebase-i-after-failure'
Various fixes to the behaviour of "rebase -i" when the command got
interrupted by conflicting changes.
* pw/rebase-i-after-failure:
rebase -i: fix adding failed command to the todo list
rebase --continue: refuse to commit after failed command
rebase: fix rewritten list for failed pick
sequencer: factor out part of pick_commits()
sequencer: use rebase_path_message()
rebase -i: remove patch file after conflict resolution
rebase -i: move unlink() calls
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions