From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Aug 2012 20:49:58 GMT
Subject: Re: Your branch and 'origin/master' have diverged
Message-ID: <7vr4r98ah5.fsf@alter.siamese.dyndns.org>
In-Reply-To: <87lihh8c7s.fsf@thomas.inf.ethz.ch>

Thomas Rast <trast@student.ethz.ch> writes:

> In some sense this is a really bad case of wrong UI design, because we
> (this happens on #git a lot) have to teach users not to use the command
> so they won't trip over this problem.  It would be better to fix the
> real issue instead.  IIRC it was even on the 1.8.0 wishlist...

Is it?

There already is a way to ask it to update the single tracking
branch while fetching; "git fetch origin master" that
unconditionally updates refs/remotes/origin/master without a way to
tell it not to do so will be a grave usability regression.