Hi,

On Sun, 10 Feb 2008, Martin Langhoff wrote:

quoted text
> 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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html