diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2012-04-11 16:21:53 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-11 13:46:08 -0700 |
| commit | df478b744cee9821eb2abbe2202d262b87a34289 (patch) | |
| tree | 63bbd30c18322c3ebfba2d53dac483a67b3bbb21 /Documentation/git-cherry-pick.txt | |
| parent | e8dde3e5f9ddb7cf95a6ff3cea6cf07c3a2db80d (diff) | |
| download | git-df478b744cee9821eb2abbe2202d262b87a34289.tar.gz | |
git-cherry-pick: add allow-empty option
git cherry-pick fails when picking a non-ff commit that is empty. The advice
given with the failure is that a git-commit --allow-empty should be issued to
explicitly add the empty commit during the cherry pick. This option allows a
user to specify before hand that they want to keep the empty commit. This
eliminates the need to issue both a cherry pick and a commit operation.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index fed5097e00..730237ab27 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -103,6 +103,15 @@ effect to your index in a row. 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 + even without this option. + --strategy=<strategy>:: Use the given merge strategy. Should only be used once. See the MERGE STRATEGIES section in linkgit:git-merge[1] |