summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2014-04-21 00:17:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-22 19:53:59 (GMT)
commita01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d (patch)
tree85511431579f68ce408f37e6cc35a6e1fe154876 /builtin/merge.c
parent779792a5f24bb4e8049c4f88ad752e70d4a8a080 (diff)
downloadgit-a01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d.zip
git-a01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d.tar.gz
git-a01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d.tar.bz2
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>
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 66d8843..1fc9319 100644
--- 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 default_to_upstream;
+static int default_to_upstream = 1;
static const char *sign_commit;
static struct strategy all_strategy[] = {