| commit | b8ef69fe2e837d78250555807073b5405f7c9297 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jun 2014 19:06:43 +0000 (3 12:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jun 2014 19:06:43 +0000 (3 12:06 -0700) | ||
| tree | 944d24d1d940611d62908daf79856c90aca60b8b | treesnapshot (tar.gz zip) |
| parent | 6779e43b0dbcaeea84319165b1f7c7480e2fe516 | commitdiff |
| parent | a01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d | commitdiff |
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
"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
| builtin/merge.c | diff1 | diff2 | blobhistory |