diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2012-04-11 20:21:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-11 20:46:08 (GMT) |
| commit | df478b744cee9821eb2abbe2202d262b87a34289 (patch) | |
| tree | 63bbd30c18322c3ebfba2d53dac483a67b3bbb21 /builtin/revert.c | |
| parent | e8dde3e5f9ddb7cf95a6ff3cea6cf07c3a2db80d (diff) | |
| download | git-df478b744cee9821eb2abbe2202d262b87a34289.zip git-df478b744cee9821eb2abbe2202d262b87a34289.tar.gz git-df478b744cee9821eb2abbe2202d262b87a34289.tar.bz2 | |
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 'builtin/revert.c')
| -rw-r--r-- | builtin/revert.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index e6840f2..06b00e6 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -114,12 +114,14 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) OPT_END(), OPT_END(), OPT_END(), + OPT_END(), }; if (opts->action == REPLAY_PICK) { struct option cp_extra[] = { OPT_BOOLEAN('x', NULL, &opts->record_origin, "append commit name"), OPT_BOOLEAN(0, "ff", &opts->allow_ff, "allow fast-forward"), + OPT_BOOLEAN(0, "allow-empty", &opts->allow_empty, "preserve empty commits"), OPT_END(), }; if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra)) |