undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/merge-dash-previous'

Browse Source 
* jc/merge-dash-previous:
  merge: allow "-" as a short-hand for "previous branch"
This commit is contained in:
Junio C Hamano 2011-04-27 11:36:42 -07:00
commit 89cd2373ea
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/merge.c
View File

@ -1062,9 +1062,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (!allow_fast_forward && fast_forward_only) if (!allow_fast_forward && fast_forward_only)
die(_("You cannot combine --no-ff with --ff-only.")); die(_("You cannot combine --no-ff with --ff-only."));
if (!argc && !abort_current_merge && default_to_upstream) if (!abort_current_merge) {
if (!argc && default_to_upstream)
argc = setup_with_upstream(&argv); argc = setup_with_upstream(&argv);
else if (argc == 1 && !strcmp(argv[0], "-"))
argv[0] = "@{-1}";
}
if (!argc) if (!argc)
usage_with_options(builtin_merge_usage, usage_with_options(builtin_merge_usage,
builtin_merge_options); builtin_merge_options);