merge: enable defaulttoupstream by default

There's no point in this:

% git merge
fatal: No commit specified and merge.defaultToUpstream not set.

We know the most likely scenario is that the user wants to merge the
upstream, and if not, he can set merge.defaultToUpstream to false.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index a3c1fa332abb8d65051f6f6d5df6a14708fba980..cf2c374b710673e891f8337cb9bcc90d72be460a 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -101,9 +101,8 @@ commit or stash your changes before running 'git merge'.
        Specifying more than one commit will create a merge with
        more than two parents (affectionately called an Octopus merge).
 +
        Specifying more than one commit will create a merge with
        more than two parents (affectionately called an Octopus merge).
 +

-If no commit is given from the command line, and if `merge.defaultToUpstream`
-configuration variable is set, merge the remote-tracking branches
-that the current branch is configured to use as its upstream.
+If no commit is given from the command line, merge the remote-tracking
+branches that the current branch is configured to use as its upstream.

 See also the configuration section of this manual page.
 
 
 See also the configuration section of this manual page.
 
 

diff --git a/builtin/merge.c b/builtin/merge.c
index 66d8843301b22a6a89d9d765e9d3020942e6f672..1fc9319d8f06f27722c371d1b76d94584466dd3a 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -63,7 +63,7 @@ static int verbosity;
 static int allow_rerere_auto;
 static int abort_current_merge;
 static int show_progress = -1;
 static int allow_rerere_auto;
 static int abort_current_merge;
 static int show_progress = -1;

-static int default_to_upstream;
+static int default_to_upstream = 1;

 static const char *sign_commit;
 
 static struct strategy all_strategy[] = {
 static const char *sign_commit;
 
 static struct strategy all_strategy[] = {