Skip to content

Commit 8c9c2bd

Browse files
committed
docs(cherry-pick): document CHERRY_PICK_HEAD ref
Signed-off-by: Florian Best <best@univention.de>
1 parent ca1db8a commit 8c9c2bd

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Documentation/git-cherry-pick.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,12 @@ EXAMPLES
228228
so the result can be inspected and made into a single new
229229
commit if suitable.
230230

231+
`git show CHERRY_PICK_HEAD`::
232+
233+
Show the commit currently being applied when a cherry-pick
234+
stops due to conflicts. The `CHERRY_PICK_HEAD` reference
235+
identifies this commit.
236+
231237
The following sequence attempts to backport a patch, bails out because
232238
the code the patch applies to has changed too much, and then tries
233239
again, this time exercising more care about matching up context lines.

0 commit comments

Comments
 (0)