Felipe Contreras wrote: > On Sun, Sep 8, 2013 at 1:10 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > >> pull.<someoption> = rebase | merge [| always-fail] >> >> makes that choice in a clear way, I think. The core issue is that users rarely want to merge locally: that's the maintainer's job. Users simply want to rebase, and develop on different branches that they will rebase onto origin. I like Felipe's idea for using a pull.mode. -- 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