From: Philippe Blain Date: Tue, 10 Jan 2023 13:15:17 +0000 (+0000) Subject: git-cherry-pick.txt: do not use 'ORIG_HEAD' in example X-Git-Tag: v2.40.0-rc0~73^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e29678bb7c967f731965829e38aab8dd88e5c031;p=thirdparty%2Fgit.git 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 Acked-by: Phillip Wood Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 1e8ac9df60..fdcad3d200 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -219,7 +219,7 @@ again, this time exercising more care about matching up context lines. ------------ $ git cherry-pick topic^ <1> $ git diff <2> -$ git reset --merge ORIG_HEAD <3> +$ git cherry-pick --abort <3> $ git cherry-pick -Xpatience topic^ <4> ------------ <1> apply the change that would be shown by `git show topic^`.