Skip to content

Commit

Permalink
Merge branch 'jc/merge-dash-previous'
Browse files Browse the repository at this point in the history
* jc/merge-dash-previous:
  merge: allow "-" as a short-hand for "previous branch"
  • Loading branch information
Junio C Hamano committed Apr 27, 2011
2 parents 65bc83d + 4e8115f commit 89cd237
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions builtin/merge.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 89cd237

Please sign in to comment.