From: Junio C Hamano Date: Mon, 31 Jan 2011 20:17:23 GMT Subject: Re: [1.8.0] default "git merge" without argument to "git merge @{u}" Message-ID: <7vaaig6d64.fsf@alter.siamese.dyndns.org> In-Reply-To: <20110131201419.GA9070@sigill.intra.peff.net> Jeff King writes: >> In 1.8.0, flip the default for merge.defaultUpstream to true. > > Other than that, I think the proposal and migration plan are fine. Heh, thanks. It's not my proposal though ;-). It is just an illustration of how I see an item from people's wishlist should look like to make it easier to discuss them.