merge: allow "-" as a short-hand for "previous branch"
Just like "git checkout -" is a short-hand for "git checkout @{-1}" to conveniently switch back to the previous branch, "git merge -" is a short-hand for "git merge @{-1}" to conveniently merge the previous branch. It will allow me to say: $ git checkout -b au/topic $ git am -s ./+au-topic.mbox $ git checkout pu $ git merge - which is an extremely typical and repetitive operation during my git day. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 7, 2011 at 15:57 UTC
4e8115fff135a09f75020083f51722e7e35eb6e9
1 file changed
+6
-3
builtin/merge.c
+6
-3
@@ -1062,9 +1062,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1062
if (!allow_fast_forward && fast_forward_only)
1063
die(_("You cannot combine --no-ff with --ff-only."));
1064
1065
- if (!argc && !abort_current_merge && default_to_upstream)
1066
- argc = setup_with_upstream(&argv);
1067
-
1065
+ if (!abort_current_merge) {
1066
+ if (!argc && default_to_upstream)
1067
+ argc = setup_with_upstream(&argv);
1068
+ else if (argc == 1 && !strcmp(argv[0], "-"))
1069
+ argv[0] = "@{-1}";
1070
+ }
1071
if (!argc)
1072
usage_with_options(builtin_merge_usage,
1073
builtin_merge_options);