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

diff --cc Documentation/git-merge.txt
Simple merge

diff --cc Documentation/merge-config.txt
Simple merge

diff --cc builtin/merge.c
index 1e0bcfd792e4fb550fea8786ff2f84e7925aca86,309bdd4dc7d61d38dc5527dfec8cc5d7eb552097..d54e7ddbb12286beb4f9622864f2eeaa79453d32
--- 1/builtin/merge.c
--- 2/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);