On Thu, May 23, 2013 at 5:06 AM, Andreas Krey <a.krey@xxxxxx> wrote: [snip] > ... >> Don't do that, then. > > :-) Problem is, in this case 'I' expands to about > 1<<7 people I need to educate on this. This is a feature of `git pull` that I really despise. I really wish `git pull` treated the remote as the first parent in its merge operation. -John -- 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