diff options
| author | Philip Oakley <philipoakley@iee.email> | 2022-06-04 11:17:47 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-06 10:45:54 -0700 |
| commit | afd58a0d42b5385089799fdd66b555df7cc8a4b4 (patch) | |
| tree | 27331ef9664372b1c925414d8a11c17ecf60ddea /commit.c | |
| parent | 2f7b9f9e55ca2d8fa23fe44678a0180f7e118c86 (diff) | |
| download | git-afd58a0d42b5385089799fdd66b555df7cc8a4b4.tar.gz | |
rebase: help users when dying with `preserve-merges`
Git would die if a "rebase --preserve-merges" was in progress.
Users could neither --quit, --abort, nor --continue the rebase.
Make the `rebase --abort` option available to allow users to remove
traces of any preserve-merges rebase, even if they had upgraded
during a rebase.
One trigger case was an unexpectedly difficult to resolve conflict, as
reported on the `git-users` group.
(https://groups.google.com/g/git-for-windows/c/3jMWbBlXXHM)
Other potential use-cases include git-experts using the portable
'Git on a stick' to help users with an older git version.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions