diff options
| author | Philippe Blain <levraiphilippeblain@gmail.com> | 2023-01-10 13:15:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-13 09:55:45 -0800 |
| commit | e29678bb7c967f731965829e38aab8dd88e5c031 (patch) | |
| tree | bfb8b6d31908ad11cf8f86dc7b20c0194dd70e3d /builtin/commit.c | |
| parent | Git 2.39 (diff) | |
| download | git-e29678bb7c967f731965829e38aab8dd88e5c031.tar.gz git-e29678bb7c967f731965829e38aab8dd88e5c031.zip | |
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>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions