]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/git-cherry-pick.txt
git-cherry-pick.txt: do not use 'ORIG_HEAD' in example
authorPhilippe Blain <levraiphilippeblain@gmail.com>
Tue, 10 Jan 2023 13:15:17 +0000 (13:15 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Jan 2023 17:55:45 +0000 (09:55 -0800)
commite29678bb7c967f731965829e38aab8dd88e5c031
treebfb8b6d31908ad11cf8f86dc7b20c0194dd70e3d
parentc48035d29b4e524aed3a32f0403676f0d9128863
git-cherry-pick.txt: do not use 'ORIG_HEAD' in example

Commit 67ac1e1d57 (cherry-pick/revert: add support for
-X/--strategy-option, 2010-12-10) added an example to the documentation
of 'git cherry-pick'. This example mentions how to abort a failed
cherry-pick and retry with an additional merge strategy option.

The command used in the example to abort the cherry-pick is 'git reset
--merge ORIG_HEAD', but cherry-pick does not write 'ORIG_HEAD' before
starting its operation. So this command would checkout a commit
unrelated to what was at HEAD when the user invoked cherry-pick.

Use 'git cherry-pick --abort' instead.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Acked-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-cherry-pick.txt