diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-27 18:36:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-27 18:36:42 (GMT) |
| commit | 89cd2373ea914e9656f169b315c4d758dfdcf07e (patch) | |
| tree | a9a7c01392ee432fca15e421d995a5b5f9886e82 /builtin | |
| parent | 65bc83d704b82b613f1f61b4ad97412376ab4a69 (diff) | |
| parent | 4e8115fff135a09f75020083f51722e7e35eb6e9 (diff) | |
| download | git-89cd2373ea914e9656f169b315c4d758dfdcf07e.zip git-89cd2373ea914e9656f169b315c4d758dfdcf07e.tar.gz git-89cd2373ea914e9656f169b315c4d758dfdcf07e.tar.bz2 | |
Merge branch 'jc/merge-dash-previous'
* jc/merge-dash-previous:
merge: allow "-" as a short-hand for "previous branch"
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index d54e7dd..0bdd19a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1062,9 +1062,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix) if (!allow_fast_forward && fast_forward_only) die(_("You cannot combine --no-ff with --ff-only.")); - if (!argc && !abort_current_merge && default_to_upstream) - argc = setup_with_upstream(&argv); - + if (!abort_current_merge) { + if (!argc && default_to_upstream) + argc = setup_with_upstream(&argv); + else if (argc == 1 && !strcmp(argv[0], "-")) + argv[0] = "@{-1}"; + } if (!argc) usage_with_options(builtin_merge_usage, builtin_merge_options); |