git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-19 21:10:38 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

fixup! rebase -i: implement the main part of interactive rebase as a builtin

Browse Source 
The `--gpg-sign` option takes an *optional* argument, not a mandatory
one.

This fixes https://github.com/git-for-windows/git/issues/1836.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2018-09-27 15:01:01 +02:00
parent 2af24038a9
commit ddb6e5ca19
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/rebase--interactive.c
View File

@@ -181,8 +181,9 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
OPT_STRING(0, "upstream", &upstream, N_("upstream"),
N_("the upstream commit")),
OPT_STRING(0, "head-name", &head_name, N_("head-name"), N_("head name")),
OPT_STRING('S', "gpg-sign", &opts.gpg_sign, N_("gpg-sign"),
N_("GPG-sign commits")),
{ OPTION_STRING, 'S', "gpg-sign", &opts.gpg_sign, N_("key-id"),
N_("GPG-sign commits"),
PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"),
N_("rebase strategy")),
OPT_STRING(0, "strategy-opts", &raw_strategies, N_("strategy-opts"),