]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 779792a) | patch
merge: enable defaulttoupstream by default
authorFelipe Contreras <felipe.contreras@gmail.com>
Mon, 21 Apr 2014 00:17:33 +0000 (19:17 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Apr 2014 19:53:59 +0000 (12:53 -0700)
commita01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d
tree85511431579f68ce408f37e6cc35a6e1fe154876tree | snapshot
parent779792a5f24bb4e8049c4f88ad752e70d4a8a080commit | diff
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>
Documentation/git-merge.txt diff | blob | blame | history
builtin/merge.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.