From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 2 Apr 2011 00:57:16 +0000 (-0700)
Subject: Merge branch 'jc/merge-sans-branch'
X-Git-Tag: v1.7.5-rc1~17
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ffc5e3c958b66fb4babeba01483cc924bc2957a5;p=git.git

Merge branch 'jc/merge-sans-branch'

* jc/merge-sans-branch:
  merge: merge with the default upstream branch without argument
  merge: match the help text with the documentation

Conflicts:
	builtin/merge.c
---

ffc5e3c958b66fb4babeba01483cc924bc2957a5
diff --cc builtin/merge.c
index 1e0bcfd79,309bdd4dc..d54e7ddbb
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@@ -58,7 -60,7 +60,8 @@@ static int option_renormalize
  static int verbosity;
  static int allow_rerere_auto;
  static int abort_current_merge;
 +static int show_progress = -1;
+ static int default_to_upstream;
  
  static struct strategy all_strategy[] = {
  	{ "recursive",  DEFAULT_TWOHEAD | NO_TRIVIAL },
@@@ -1025,8 -1016,11 +1060,11 @@@ int cmd_merge(int argc, const char **ar
  	}
  
  	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)
+ 		argc = setup_with_upstream(&argv);
+ 
  	if (!argc)
  		usage_with_options(builtin_merge_usage,
  			builtin_merge_options);