git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6779e43 a01f7f2)
Merge branch 'fc/merge-default-to-upstream'
authorJunio C Hamano <redacted>
Tue, 3 Jun 2014 19:06:43 +0000 (12:06 -0700)
committerJunio C Hamano <redacted>
Tue, 3 Jun 2014 19:06:43 +0000 (12:06 -0700)
commitb8ef69fe2e837d78250555807073b5405f7c9297
tree944d24d1d940611d62908daf79856c90aca60b8btree | snapshot
parent6779e43b0dbcaeea84319165b1f7c7480e2fe516commit | diff
parenta01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173dcommit | diff
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
builtin/merge.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT