Felipe Contreras a01f7f2ba0 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>

2014-04-22 12:53:59 -07:00

12 KiB

Raw Blame History

View Raw