]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: da1d633) | patch
rebase --merge: fix reflog message after skipping
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Wed, 12 Oct 2022 09:35:08 +0000 (09:35 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Oct 2022 19:55:03 +0000 (12:55 -0700)
commit1f2d5dc4d2bbcae87736fcd7b7c0e6542008c5f7
tree959c81b4e972fb9f38f8ef13e4cd6a61f702e576tree | snapshot
parentda1d63363f13d4d65c59564c74fd8dd598b39c49commit | diff
rebase --merge: fix reflog message after skipping

The reflog message for every pick after running "rebase --skip" looks
like

rebase (skip) (pick): commit subject line

Fix this by not appending " (skip)" to the reflog action.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c diff | blob | blame | history
t/t3406-rebase-message.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.