Error message from get_sha1() on ambiguous short SHA1.
[git/git.git] / Documentation / git-cherry-pick.txt
CommitLineData
215a7ad1
JH
1git-cherry-pick(1)
2==================
de2b82c6
JH
3v0.99.5 Aug 2005
4
5NAME
6----
215a7ad1 7git-cherry-pick - Apply the change introduced by an existing commit.
de2b82c6
JH
8
9SYNOPSIS
10--------
215a7ad1 11'git-cherry-pick' [-n] [-r] <commit>
de2b82c6
JH
12
13DESCRIPTION
14-----------
15Given one existing commit, apply the change the patch introduces, and record a
16new commit that records it. This requires your working tree to be clean (no
17modifications from the HEAD commit).
18
19OPTIONS
20-------
21<commit>::
22 Commit to cherry-pick.
23
24-r::
25 Usuall the command appends which commit was
26 cherry-picked after the original commit message when
27 making a commit. This option, '--replay', causes it to
28 use the original commit message intact. This is useful
29 when you are reordering the patches in your private tree
30 before publishing, and is used by 'git rebase'.
31
32-n::
33 Usually the command automatically creates a commit with
34 a commit log message stating which commit was
35 cherry-picked. This flag applies the change necessary
36 to cherry-pick the named commit to your working tree,
37 but does not make the commit. In addition, when this
38 option is used, your working tree does not have to match
39 the HEAD commit. The cherry-pick is done against the
40 beginning state of your working tree.
41
42 This is useful when cherry-picking more than one commits'
43 effect to your working tree in a row.
44
45
46Author
47------
48Written by Junio C Hamano <junkio@cox.net>
49
50Documentation
51--------------
52Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
53
54GIT
55---
a7154e91 56Part of the gitlink:git[7] suite
de2b82c6 57