From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 09 Feb 2008 13:06:42 GMT
Subject: Re: Minor annoyance with git push
Message-ID: <alpine.LSU.1.00.0802091304440.11591@racer.site>
In-Reply-To: <46a038f90802090350rc4780d1ted60c03b9abf1fc0@mail.gmail.com>

Hi,

On Sun, 10 Feb 2008, Martin Langhoff wrote:

> And I don't completely follow how bad the impact of
> auto-fast-forwarding local tracking branches on a merge. If it's a
> fast-forward, my "local state" wasn't that exciting to begin with ;-)

Not necessarily.  Maybe you wanted to work on it, kept your local branch 
as a reminder.  Maybe even reset --hard to a known-bad commit.

The thing is: local is local is local.  If you muddy the clear 
distinctions, you will make semantics much harder to grasp.

Having said that, you _could_ introduce a command line option 
"--ff-local-branches", which would keep the semantics clean.

Ciao,
Dscho