diff --git a/Documentation/git-cherry-pick.adoc b/Documentation/git-cherry-pick.adoc index 42b41923d5f0bc..21de8bbb0ee5cb 100644 --- a/Documentation/git-cherry-pick.adoc +++ b/Documentation/git-cherry-pick.adoc @@ -228,6 +228,12 @@ EXAMPLES so the result can be inspected and made into a single new commit if suitable. +`git show CHERRY_PICK_HEAD`:: + + Show the commit currently being applied when a cherry-pick + stops due to conflicts. The `CHERRY_PICK_HEAD` reference + identifies this commit. + The following sequence attempts to backport a patch, bails out because the code the patch applies to has changed too much, and then tries again, this time exercising more care about matching up context lines.