Login or Register to Ask a Question and Join Our Community

Linux and UNIX Man Pages

Linux & Unix Commands - Search Man Pages

git-cherry-pick(1) [suse man page]

GIT-CHERRY-PICK(1)						    Git Manual							GIT-CHERRY-PICK(1)

NAME

       git-cherry-pick - Apply the change introduced by an existing commit

SYNOPSIS

       git cherry-pick [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>

DESCRIPTION

       Given one existing commit, apply the change the patch introduces, and record a new commit that records it. This requires your working tree
       to be clean (no modifications from the HEAD commit).

OPTIONS

       <commit>
	   Commit to cherry-pick. For a more complete list of ways to spell commits, see the "SPECIFYING REVISIONS" section in git-rev-parse(1).

       -e, --edit
	   With this option, git cherry-pick will let you edit the commit message prior to committing.

       -x
	   When recording the commit, append to the original commit message a note that indicates which commit this change was cherry-picked from.
	   Append the note only for cherry picks without conflicts. Do not use this option if you are cherry-picking from your private branch
	   because the information is useless to the recipient. If on the other hand you are cherry-picking between two publicly visible branches
	   (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful.

       -r
	   It used to be that the command defaulted to do -x described above, and -r was to disable it. Now the default is not to do -x so this
	   option is a no-op.

       -m parent-number, --mainline parent-number
	   Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option
	   specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified
	   parent.

       -n, --no-commit
	   Usually the command automatically creates a commit. This flag applies the change necessary to cherry-pick the named commit to your
	   working tree and the index, but does not make the commit. In addition, when this option is used, your index does not have to match the
	   HEAD commit. The cherry-pick is done against the beginning state of your index.

	   This is useful when cherry-picking more than one commits' effect to your index in a row.

       -s, --signoff
	   Add Signed-off-by line at the end of the commit message.

       --ff
	   If the current HEAD is the same as the parent of the cherry-pick'ed commit, then a fast forward to this commit will be performed.

AUTHOR

       Written by Junio C Hamano <gitster@pobox.com[1]>

DOCUMENTATION

       Documentation by Junio C Hamano and the git-list <git@vger.kernel.org[2]>.

GIT

       Part of the git(1) suite

NOTES

	1. gitster@pobox.com
	   mailto:gitster@pobox.com

	2. git@vger.kernel.org
	   mailto:git@vger.kernel.org

Git 1.7.1							    07/05/2010							GIT-CHERRY-PICK(1)

Check Out this Related Man Page

GIT-CHERRY(1)							    Git Manual							     GIT-CHERRY(1)

NAME

       git-cherry - Find commits not merged upstream

SYNOPSIS

       git cherry [-v] [<upstream> [<head> [<limit>]]]

DESCRIPTION

       The changeset (or "diff") of each commit between the fork-point and <head> is compared against each commit between the fork-point and
       <upstream>. The commits are compared with their patch id, obtained from the git patch-id program.

       Every commit that doesn't exist in the <upstream> branch has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent
       change already in the <upstream> branch are prefixed with a minus (-) sign, and those that only exist in the <head> branch are prefixed
       with a plus (+) symbol:

		      __*__*__*__*__> <upstream>
		     /
	   fork-point
		     \__+__+__-__+__+__-__+__> <head>

       If a <limit> has been given then the commits along the <head> branch up to and including <limit> are not reported:

		      __*__*__*__*__> <upstream>
		     /
	   fork-point
		     \__*__*__<limit>__-__+__> <head>

       Because git cherry compares the changeset rather than the commit id (sha1), you can use git cherry to find out if a commit you made locally
       has been applied <upstream> under a different commit id. For example, this will happen if you're feeding patches <upstream> via email
       rather than pushing or pulling commits directly.

OPTIONS

       -v
	   Verbose.

       <upstream>
	   Upstream branch to compare against. Defaults to the first tracked remote branch, if available.

       <head>
	   Working branch; defaults to HEAD.

       <limit>
	   Do not report commits up to (and including) limit.

SEE ALSO

       git-patch-id(1)

AUTHOR

       Written by Junio C Hamano <gitster@pobox.com[1]>

DOCUMENTATION

       Documentation by Junio C Hamano and the git-list <git@vger.kernel.org[2]>.

GIT

       Part of the git(1) suite

NOTES

	1. gitster@pobox.com
	   mailto:gitster@pobox.com

	2. git@vger.kernel.org
	   mailto:git@vger.kernel.org

Git 1.7.1							    07/05/2010							     GIT-CHERRY(1)
Man Page