diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-17 13:09:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-17 13:09:59 -0700 |
| commit | c757aa2d12ceeb5a86c2da8ad1e9e752625af739 (patch) | |
| tree | 9adebc7b9fe47fde483eb4d1734c83dc355ccdc7 /builtin | |
| parent | Merge branch 'jk/diff-rendered-docs' (diff) | |
| parent | pull --rebase=<type>: allow single-letter abbreviations for the type (diff) | |
| download | tgif-c757aa2d12ceeb5a86c2da8ad1e9e752625af739.tar.xz | |
Merge branch 'js/pull-rebase-type-shorthand'
"git pull --rebase=interactive" learned "i" as a short-hand for
"interactive".
* js/pull-rebase-type-shorthand:
pull --rebase=<type>: allow single-letter abbreviations for the type
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pull.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 4e78935392..53bc5facfd 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -48,11 +48,11 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value, return REBASE_FALSE; else if (v > 0) return REBASE_TRUE; - else if (!strcmp(value, "preserve")) + else if (!strcmp(value, "preserve") || !strcmp(value, "p")) return REBASE_PRESERVE; - else if (!strcmp(value, "merges")) + else if (!strcmp(value, "merges") || !strcmp(value, "m")) return REBASE_MERGES; - else if (!strcmp(value, "interactive")) + else if (!strcmp(value, "interactive") || !strcmp(value, "i")) return REBASE_INTERACTIVE; if (fatal) |