mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fc/merge-default-to-upstream'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2014-06-03 12:06:43 -07:00
parent 6779e43b0d a01f7f2ba0
commit b8ef69fe2e
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge.c
View File

@ -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[] = {