pr-1150/phillipwood/wip/rebase-reflog-fixes-v1
tagged this
21 Feb 11:10
This is a series of rebase reflog related patches with the aim of unifying the reflog messages from the two rebase backends. * improve rebase reflog test coverage * rebase --merge: fix reflog messages for --continue and --skip * rebase --apply: respect GIT_REFLOG_ACTION * rebase --abort: improve reflog message * unify reflog messages between the two rebase backends This series is based on pw/use-inprocess-checkout-in-rebase Phillip Wood (7): rebase --apply: remove duplicated code rebase --merge: fix reflog when continuing rebase --merge: fix reflog message after skipping rebase --apply: respect GIT_REFLOG_ACTION rebase --apply: make reflog messages match rebase --merge rebase --abort: improve reflog message rebase: cleanup action handling builtin/rebase.c | 144 ++++++++++++----------------- sequencer.c | 5 ++ t/t3406-rebase-message.sh | 185 +++++++++++++++++++++++++++++++------- 3 files changed, 214 insertions(+), 120 deletions(-) base-commit: 38c541ce94048cf72aa4f465be9314423a57f445 Submitted-As: https://lore.kernel.org/git/pull.1150.git.1645441854.gitgitgadget@gmail.com
Assets 2
-
2022-02-21T11:10:54Z -
2022-02-21T11:10:54Z -