From: Taylor Blau <me@ttaylorr.com>
Date: Mon, 31 Oct 2022 01:04:42 +0000 (-0400)
Subject: Merge branch 'pw/rebase-reflog-fixes'
X-Git-Tag: v2.39.0-rc0~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8851c4b0652f7e69abfe0016503ab9ea1d247c84;p=thirdparty%2Fgit.git

Merge branch 'pw/rebase-reflog-fixes'

Fix some bugs in the reflog messages when rebasing and changes the
reflog messages of "rebase --apply" to match "rebase --merge" with
the aim of making the reflog easier to parse.

* pw/rebase-reflog-fixes:
  rebase: cleanup action handling
  rebase --abort: improve reflog message
  rebase --apply: make reflog messages match rebase --merge
  rebase --apply: respect GIT_REFLOG_ACTION
  rebase --merge: fix reflog message after skipping
  rebase --merge: fix reflog when continuing
  t3406: rework rebase reflog tests
  rebase --apply: remove duplicated code
---

8851c4b0652f7e69abfe0016503ab9ea1d247c84