diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-02-21 12:45:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-21 12:45:04 -0800 |
| commit | 2f6128daab0764c3915dcc9e01c27381b63f5e40 (patch) | |
| tree | 927fac93c9596bf67ae85e67b0f98ddb47b2d6da /builtin | |
| parent | Merge branch 'lw/daemon-log-destination' (diff) | |
| parent | rebase: add --allow-empty-message option (diff) | |
| download | tgif-2f6128daab0764c3915dcc9e01c27381b63f5e40.tar.xz | |
Merge branch 'gs/rebase-allow-empty-message'
"git rebase" learned to take "--allow-empty-message" option.
* gs/rebase-allow-empty-message:
rebase: add --allow-empty-message option
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase--helper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c index 00faf14d07..ad074705bb 100644 --- a/builtin/rebase--helper.c +++ b/builtin/rebase--helper.c @@ -22,6 +22,8 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) struct option options[] = { OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")), OPT_BOOL(0, "keep-empty", &keep_empty, N_("keep empty commits")), + OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message, + N_("allow commits with empty messages")), OPT_CMDMODE(0, "continue", &command, N_("continue rebase"), CONTINUE), OPT_CMDMODE(0, "abort", &command, N_("abort rebase"), |