]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.h
sequencer: advise if skipping cherry-picked commit
authorJosh Steadmon <steadmon@google.com>
Mon, 30 Aug 2021 21:46:02 +0000 (14:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Aug 2021 23:35:36 +0000 (16:35 -0700)
commit767a4ca648f8791c1fb623bd9f79fd8d7f026499
treea412a04463d6b0bb7e36fcdabe5512d539b89593
parent2d755dfac9aadab25c3e025b849252b8c0a61465
sequencer: advise if skipping cherry-picked commit

Silently skipping commits when rebasing with --no-reapply-cherry-picks
(currently the default behavior) can cause user confusion. Issue
warnings when this happens, as well as advice on how to preserve the
skipped commits.

These warnings and advice are displayed only when using the (default)
"merge" rebase backend.

Update the git-rebase docs to mention the warnings and advice.

Signed-off-by: Josh Steadmon <steadmon@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config/advice.txt
Documentation/git-rebase.txt
advice.c
advice.h
builtin/rebase.c
sequencer.c
sequencer.h