Skip to content

docs(cherry-pick): document CHERRY_PICK_HEAD ref #2243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spaceone wants to merge 1 commit into
base: master
Choose a base branch
from
Open

docs(cherry-pick): document CHERRY_PICK_HEAD ref #2243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Documentation/git-cherry-pick.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading