|
|
|
|
git-cherry-pick(1)
|
|
|
|
|
==================
|
|
|
|
|
|
|
|
|
|
NAME
|
|
|
|
|
----
|
|
|
|
|
git-cherry-pick - Apply the changes introduced by some existing commits
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
--------
|
|
|
|
|
[verse]
|
|
|
|
|
'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>...
|
|
|
|
|
'git cherry-pick' --continue
|
|
|
|
|
'git cherry-pick' --quit
|
|
|
|
|
'git cherry-pick' --abort
|
|
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
-----------
|
|
|
|
|
|
|
|
|
|
Given one or more existing commits, apply the change each one
|
|
|
|
|
introduces, recording a new commit for each. This requires your
|
|
|
|
|
working tree to be clean (no modifications from the HEAD commit).
|
|
|
|
|
|
|
|
|
|
When it is not obvious how to apply a change, the following
|
|
|
|
|
happens:
|
|
|
|
|
|
|
|
|
|
1. The current branch and `HEAD` pointer stay at the last commit
|
|
|
|
|
successfully made.
|
|
|
|
|
2. The `CHERRY_PICK_HEAD` ref is set to point at the commit that
|
|
|
|
|
introduced the change that is difficult to apply.
|
|
|
|
|
3. Paths in which the change applied cleanly are updated both
|
|
|
|
|
in the index file and in your working tree.
|
|
|
|
|
4. For conflicting paths, the index file records up to three
|
|
|
|
|
versions, as described in the "TRUE MERGE" section of
|
|
|
|
|
linkgit:git-merge[1]. The working tree files will include
|
|
|
|
|
a description of the conflict bracketed by the usual
|
|
|
|
|
conflict markers `<<<<<<<` and `>>>>>>>`.
|
|
|
|
|
5. No other modifications are made.
|
|
|
|
|
|
|
|
|
|
See linkgit:git-merge[1] for some hints on resolving such
|
|
|
|
|
conflicts.
|
|
|
|
|
|
|
|
|
|
OPTIONS
|
|
|
|
|
-------
|
|
|
|
|
<commit>...::
|
|
|
|
|
Commits to cherry-pick.
|
|
|
|
|
For a more complete list of ways to spell commits, see
|
|
|
|
|
linkgit:gitrevisions[7].
|
|
|
|
|
Sets of commits can be passed but no traversal is done by
|
|
|
|
|
default, as if the '--no-walk' option was specified, see
|
|
|
|
|
linkgit:git-rev-list[1]. Note that specifying a range will
|
|
|
|
|
feed all <commit>... arguments to a single revision walk
|
|
|
|
|
(see a later example that uses 'maint master..next').
|
|
|
|
|
|
|
|
|
|
-e::
|
|
|
|
|
--edit::
|
|
|
|
|
With this option, 'git cherry-pick' will let you edit the commit
|
|
|
|
|
message prior to committing.
|
|
|
|
|
|
|
|
|
|
-x::
|
|
|
|
|
When recording the commit, append a line that says
|
|
|
|
|
"(cherry picked from commit ...)" to the original commit
|
|
|
|
|
message in order to indicate which commit this change was
|
|
|
|
|
cherry-picked from. This is done 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 sequence of commits.
|
|
|
|
|
This flag applies the changes necessary to cherry-pick
|
|
|
|
|
each named commit to your working tree and the index,
|
|
|
|
|
without making any 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.
|
|
|
|
|
|
|
|
|
|
--allow-empty::
|
|
|
|
|
By default, cherry-picking an empty commit will fail,
|
|
|
|
|
indicating that an explicit invocation of `git commit
|
|
|
|
|
--allow-empty` is required. This option overrides that
|
|
|
|
|
behavior, allowing empty commits to be preserved automatically
|
|
|
|
|
in a cherry-pick. Note that when "--ff" is in effect, empty
|
|
|
|
|
commits that meet the "fast-forward" requirement will be kept
|
git-cherry-pick: Add keep-redundant-commits option
The git-cherry-pick --allow-empty command by default only preserves empty
commits that were originally empty, i.e only those commits for which
<commit>^{tree} and <commit>^^{tree} are equal. By default commits which are
non-empty, but were made empty by the inclusion of a prior commit on the current
history are filtered out. This option allows us to override that behavior and
include redundant commits as empty commits in the change history.
Note that this patch changes the default behavior of git cherry-pick slightly.
Prior to this patch all commits in a cherry-pick sequence were applied and git
commit was run. The implication here was that, if a commit was redundant, and
the commit did not trigger the fast forward logic, the git commit operation, and
therefore the git cherry-pick operation would fail, displaying the cherry pick
advice (i.e. run git commit --allow-empty). With this patch however, such
redundant commits are automatically skipped without stopping, unless
--keep-redundant-commits is specified, in which case, they are automatically
applied as empty commits.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years ago
|
|
|
even without this option. Note also, that use of this option only
|
|
|
|
|
keeps commits that were initially empty (i.e. the commit recorded the
|
|
|
|
|
same tree as its parent). Commits which are made empty due to a
|
|
|
|
|
previous commit are dropped. To force the inclusion of those commits
|
|
|
|
|
use `--keep-redundant-commits`.
|
|
|
|
|
|
|
|
|
|
--allow-empty-message::
|
|
|
|
|
By default, cherry-picking a commit with an empty message will fail.
|
|
|
|
|
This option overrides that behaviour, allowing commits with empty
|
|
|
|
|
messages to be cherry picked.
|
|
|
|
|
|
git-cherry-pick: Add keep-redundant-commits option
The git-cherry-pick --allow-empty command by default only preserves empty
commits that were originally empty, i.e only those commits for which
<commit>^{tree} and <commit>^^{tree} are equal. By default commits which are
non-empty, but were made empty by the inclusion of a prior commit on the current
history are filtered out. This option allows us to override that behavior and
include redundant commits as empty commits in the change history.
Note that this patch changes the default behavior of git cherry-pick slightly.
Prior to this patch all commits in a cherry-pick sequence were applied and git
commit was run. The implication here was that, if a commit was redundant, and
the commit did not trigger the fast forward logic, the git commit operation, and
therefore the git cherry-pick operation would fail, displaying the cherry pick
advice (i.e. run git commit --allow-empty). With this patch however, such
redundant commits are automatically skipped without stopping, unless
--keep-redundant-commits is specified, in which case, they are automatically
applied as empty commits.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years ago
|
|
|
--keep-redundant-commits::
|
|
|
|
|
If a commit being cherry picked duplicates a commit already in the
|
|
|
|
|
current history, it will become empty. By default these
|
|
|
|
|
redundant commits are ignored. This option overrides that behavior and
|
|
|
|
|
creates an empty commit object. Implies `--allow-empty`.
|
|
|
|
|
|
|
|
|
|
--strategy=<strategy>::
|
|
|
|
|
Use the given merge strategy. Should only be used once.
|
|
|
|
|
See the MERGE STRATEGIES section in linkgit:git-merge[1]
|
|
|
|
|
for details.
|
|
|
|
|
|
|
|
|
|
-X<option>::
|
|
|
|
|
--strategy-option=<option>::
|
|
|
|
|
Pass the merge strategy-specific option through to the
|
|
|
|
|
merge strategy. See linkgit:git-merge[1] for details.
|
|
|
|
|
|
|
|
|
|
SEQUENCER SUBCOMMANDS
|
|
|
|
|
---------------------
|
|
|
|
|
include::sequencer.txt[]
|
|
|
|
|
|
|
|
|
|
EXAMPLES
|
|
|
|
|
--------
|
docs: put listed example commands in backticks
Many examples of git command invocation are given in asciidoc listing
blocks, which makes them monospaced and avoids further interpretation of
special characters. Some manpages make a list of examples, like:
git foo::
Run git foo.
git foo -q::
Use the "-q" option.
to quickly show many variants. However, they can sometimes be hard to
read, because they are shown in a proportional-width font (so, for
example, seeing the difference between "-- foo" and "--foo" can be
difficult).
This patch puts all such examples into backticks, which gives the
equivalent formatting to a listing block (i.e., monospaced and without
character interpretation).
As a bonus, this also fixes an example in the git-push manpage, in which
"git push origin :::" was accidentally considered a newly-indented list,
and not a list item with "git push origin :" in it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years ago
|
|
|
`git cherry-pick master`::
|
|
|
|
|
|
|
|
|
|
Apply the change introduced by the commit at the tip of the
|
|
|
|
|
master branch and create a new commit with this change.
|
|
|
|
|
|
docs: put listed example commands in backticks
Many examples of git command invocation are given in asciidoc listing
blocks, which makes them monospaced and avoids further interpretation of
special characters. Some manpages make a list of examples, like:
git foo::
Run git foo.
git foo -q::
Use the "-q" option.
to quickly show many variants. However, they can sometimes be hard to
read, because they are shown in a proportional-width font (so, for
example, seeing the difference between "-- foo" and "--foo" can be
difficult).
This patch puts all such examples into backticks, which gives the
equivalent formatting to a listing block (i.e., monospaced and without
character interpretation).
As a bonus, this also fixes an example in the git-push manpage, in which
"git push origin :::" was accidentally considered a newly-indented list,
and not a list item with "git push origin :" in it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years ago
|
|
|
`git cherry-pick ..master`::
|
|
|
|
|
`git cherry-pick ^HEAD master`::
|
|
|
|
|
|
|
|
|
|
Apply the changes introduced by all commits that are ancestors
|
|
|
|
|
of master but not of HEAD to produce new commits.
|
|
|
|
|
|
|
|
|
|
`git cherry-pick maint next ^master`::
|
|
|
|
|
`git cherry-pick maint master..next`::
|
|
|
|
|
|
|
|
|
|
Apply the changes introduced by all commits that are
|
|
|
|
|
ancestors of maint or next, but not master or any of its
|
|
|
|
|
ancestors. Note that the latter does not mean `maint` and
|
|
|
|
|
everything between `master` and `next`; specifically,
|
|
|
|
|
`maint` will not be used if it is included in `master`.
|
|
|
|
|
|
docs: stop using asciidoc no-inline-literal
In asciidoc 7, backticks like `foo` produced a typographic
effect, but did not otherwise affect the syntax. In asciidoc
8, backticks introduce an "inline literal" inside which markup
is not interpreted. To keep compatibility with existing
documents, asciidoc 8 has a "no-inline-literal" attribute to
keep the old behavior. We enabled this so that the
documentation could be built on either version.
It has been several years now, and asciidoc 7 is no longer
in wide use. We can now decide whether or not we want
inline literals on their own merits, which are:
1. The source is much easier to read when the literal
contains punctuation. You can use `master~1` instead
of `master{tilde}1`.
2. They are less error-prone. Because of point (1), we
tend to make mistakes and forget the extra layer of
quoting.
This patch removes the no-inline-literal attribute from the
Makefile and converts every use of backticks in the
documentation to an inline literal (they must be cleaned up,
or the example above would literally show "{tilde}" in the
output).
Problematic sites were found by grepping for '`.*[{\\]' and
examined and fixed manually. The results were then verified
by comparing the output of "html2text" on the set of
generated html pages. Doing so revealed that in addition to
making the source more readable, this patch fixes several
formatting bugs:
- HTML rendering used the ellipsis character instead of
literal "..." in code examples (like "git log A...B")
- some code examples used the right-arrow character
instead of '->' because they failed to quote
- api-config.txt did not quote tilde, and the resulting
HTML contained a bogus snippet like:
<tt><sub></tt> foo <tt></sub>bar</tt>
which caused some parsers to choke and omit whole
sections of the page.
- git-commit.txt confused ``foo`` (backticks inside a
literal) with ``foo'' (matched double-quotes)
- mentions of `A U Thor <author@example.com>` used to
erroneously auto-generate a mailto footnote for
author@example.com
- the description of --word-diff=plain incorrectly showed
the output as "[-removed-] and {added}", not "{+added+}".
- using "prime" notation like:
commit `C` and its replacement `C'`
confused asciidoc into thinking that everything between
the first backtick and the final apostrophe were meant
to be inside matched quotes
- asciidoc got confused by the escaping of some of our
asterisks. In particular,
`credential.\*` and `credential.<url>.\*`
properly escaped the asterisk in the first case, but
literally passed through the backslash in the second
case.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years ago
|
|
|
`git cherry-pick master~4 master~2`::
|
|
|
|
|
|
|
|
|
|
Apply the changes introduced by the fifth and third last
|
|
|
|
|
commits pointed to by master and create 2 new commits with
|
|
|
|
|
these changes.
|
|
|
|
|
|
docs: put listed example commands in backticks
Many examples of git command invocation are given in asciidoc listing
blocks, which makes them monospaced and avoids further interpretation of
special characters. Some manpages make a list of examples, like:
git foo::
Run git foo.
git foo -q::
Use the "-q" option.
to quickly show many variants. However, they can sometimes be hard to
read, because they are shown in a proportional-width font (so, for
example, seeing the difference between "-- foo" and "--foo" can be
difficult).
This patch puts all such examples into backticks, which gives the
equivalent formatting to a listing block (i.e., monospaced and without
character interpretation).
As a bonus, this also fixes an example in the git-push manpage, in which
"git push origin :::" was accidentally considered a newly-indented list,
and not a list item with "git push origin :" in it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years ago
|
|
|
`git cherry-pick -n master~1 next`::
|
|
|
|
|
|
|
|
|
|
Apply to the working tree and the index the changes introduced
|
|
|
|
|
by the second last commit pointed to by master and by the last
|
|
|
|
|
commit pointed to by next, but do not create any commit with
|
|
|
|
|
these changes.
|
|
|
|
|
|
docs: put listed example commands in backticks
Many examples of git command invocation are given in asciidoc listing
blocks, which makes them monospaced and avoids further interpretation of
special characters. Some manpages make a list of examples, like:
git foo::
Run git foo.
git foo -q::
Use the "-q" option.
to quickly show many variants. However, they can sometimes be hard to
read, because they are shown in a proportional-width font (so, for
example, seeing the difference between "-- foo" and "--foo" can be
difficult).
This patch puts all such examples into backticks, which gives the
equivalent formatting to a listing block (i.e., monospaced and without
character interpretation).
As a bonus, this also fixes an example in the git-push manpage, in which
"git push origin :::" was accidentally considered a newly-indented list,
and not a list item with "git push origin :" in it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years ago
|
|
|
`git cherry-pick --ff ..next`::
|
|
|
|
|
|
|
|
|
|
If history is linear and HEAD is an ancestor of next, update
|
|
|
|
|
the working tree and advance the HEAD pointer to match next.
|
|
|
|
|
Otherwise, apply the changes introduced by those commits that
|
|
|
|
|
are in next but not HEAD to the current branch, creating a new
|
|
|
|
|
commit for each new change.
|
|
|
|
|
|
docs: stop using asciidoc no-inline-literal
In asciidoc 7, backticks like `foo` produced a typographic
effect, but did not otherwise affect the syntax. In asciidoc
8, backticks introduce an "inline literal" inside which markup
is not interpreted. To keep compatibility with existing
documents, asciidoc 8 has a "no-inline-literal" attribute to
keep the old behavior. We enabled this so that the
documentation could be built on either version.
It has been several years now, and asciidoc 7 is no longer
in wide use. We can now decide whether or not we want
inline literals on their own merits, which are:
1. The source is much easier to read when the literal
contains punctuation. You can use `master~1` instead
of `master{tilde}1`.
2. They are less error-prone. Because of point (1), we
tend to make mistakes and forget the extra layer of
quoting.
This patch removes the no-inline-literal attribute from the
Makefile and converts every use of backticks in the
documentation to an inline literal (they must be cleaned up,
or the example above would literally show "{tilde}" in the
output).
Problematic sites were found by grepping for '`.*[{\\]' and
examined and fixed manually. The results were then verified
by comparing the output of "html2text" on the set of
generated html pages. Doing so revealed that in addition to
making the source more readable, this patch fixes several
formatting bugs:
- HTML rendering used the ellipsis character instead of
literal "..." in code examples (like "git log A...B")
- some code examples used the right-arrow character
instead of '->' because they failed to quote
- api-config.txt did not quote tilde, and the resulting
HTML contained a bogus snippet like:
<tt><sub></tt> foo <tt></sub>bar</tt>
which caused some parsers to choke and omit whole
sections of the page.
- git-commit.txt confused ``foo`` (backticks inside a
literal) with ``foo'' (matched double-quotes)
- mentions of `A U Thor <author@example.com>` used to
erroneously auto-generate a mailto footnote for
author@example.com
- the description of --word-diff=plain incorrectly showed
the output as "[-removed-] and {added}", not "{+added+}".
- using "prime" notation like:
commit `C` and its replacement `C'`
confused asciidoc into thinking that everything between
the first backtick and the final apostrophe were meant
to be inside matched quotes
- asciidoc got confused by the escaping of some of our
asterisks. In particular,
`credential.\*` and `credential.<url>.\*`
properly escaped the asterisk in the first case, but
literally passed through the backslash in the second
case.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years ago
|
|
|
`git rev-list --reverse master -- README | git cherry-pick -n --stdin`::
|
|
|
|
|
|
|
|
|
|
Apply the changes introduced by all commits on the master
|
|
|
|
|
branch that touched README to the working tree and index,
|
|
|
|
|
so the result can be inspected and made into a single new
|
|
|
|
|
commit if suitable.
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
------------
|
|
|
|
|
$ git cherry-pick topic^ <1>
|
|
|
|
|
$ git diff <2>
|
|
|
|
|
$ git reset --merge ORIG_HEAD <3>
|
|
|
|
|
$ git cherry-pick -Xpatience topic^ <4>
|
|
|
|
|
------------
|
|
|
|
|
<1> apply the change that would be shown by `git show topic^`.
|
|
|
|
|
In this example, the patch does not apply cleanly, so
|
|
|
|
|
information about the conflict is written to the index and
|
|
|
|
|
working tree and no new commit results.
|
|
|
|
|
<2> summarize changes to be reconciled
|
|
|
|
|
<3> cancel the cherry-pick. In other words, return to the
|
|
|
|
|
pre-cherry-pick state, preserving any local modifications you had in
|
|
|
|
|
the working tree.
|
|
|
|
|
<4> try to apply the change introduced by `topic^` again,
|
|
|
|
|
spending extra time to avoid mistakes based on incorrectly matching
|
|
|
|
|
context lines.
|
|
|
|
|
|
|
|
|
|
SEE ALSO
|
|
|
|
|
--------
|
|
|
|
|
linkgit:git-revert[1]
|
|
|
|
|
|
|
|
|
|
GIT
|
|
|
|
|
---
|
|
|
|
|
Part of the linkgit:git[1] suite
|
