summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-03 19:06:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-03 19:06:43 (GMT)
commitb8ef69fe2e837d78250555807073b5405f7c9297 (patch)
tree944d24d1d940611d62908daf79856c90aca60b8b /builtin/merge.c
parent6779e43b0dbcaeea84319165b1f7c7480e2fe516 (diff)
parenta01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d (diff)
downloadgit-b8ef69fe2e837d78250555807073b5405f7c9297.zip
git-b8ef69fe2e837d78250555807073b5405f7c9297.tar.gz
git-b8ef69fe2e837d78250555807073b5405f7c9297.tar.bz2
Merge branch 'fc/merge-default-to-upstream'
"git merge" without argument, even when there is an upstream defined for the current branch, refused to run until merge.defaultToUpstream is set to true. Flip the default of that configuration variable to true. * fc/merge-default-to-upstream: merge: enable defaulttoupstream by default
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 7c9d8f2..428ca24 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[] = {