Hi, On Wed, 24 Oct 2007, Andreas Ericsson wrote: > Conceptually, I don't think it'll be any problem what so ever telling > anyone that the branches that aren't currently checked out get merged > automatically only if they result in a fast-forward. It would be a matter of seconds until someone asks "why only fast-forwards? Would it not be _much_ better to merge _always_? Stupid git." And all because the concept of "local" vs "remote" was blurred. Ciao, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html