summaryrefslogtreecommitdiff
path: root/sequencer.h
diff options
context:
space:
mode:
authorNeil Horman <nhorman@tuxdriver.com>2012-04-11 16:21:53 -0400
committerJunio C Hamano <gitster@pobox.com>2012-04-11 13:46:08 -0700
commitdf478b744cee9821eb2abbe2202d262b87a34289 (patch)
tree63bbd30c18322c3ebfba2d53dac483a67b3bbb21 /sequencer.h
parente8dde3e5f9ddb7cf95a6ff3cea6cf07c3a2db80d (diff)
downloadgit-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 'sequencer.h')
-rw-r--r--sequencer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h
index bb4b13830e..e2cd725401 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -29,6 +29,7 @@ struct replay_opts {
int signoff;
int allow_ff;
int allow_rerere_auto;
+ int allow_empty;
int mainline;