diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:42 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:43 -0400 |
| commit | 8851c4b0652f7e69abfe0016503ab9ea1d247c84 (patch) | |
| tree | 3f4ed481646060a330429949df440b4524fda537 /diffcore-rotate.c | |
| parent | 003f815dd9f42b1bb893338b32d9cce33a8926c1 (diff) | |
| parent | 9a1925b08f3d9b71f06226f5ac32f24587f39151 (diff) | |
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
Diffstat (limited to 'diffcore-rotate.c')
0 files changed, 0 insertions, 0 deletions