On Sun, Aug 11, 2013 at 2:16 AM, Eric Sunshine <sunshine@xxxxxxxxxxxxxx> wrote: > Also, it's not clear from the documentation how one would override > pull.rebase=preserve in order to do a normal non-preserving rebase. > From reading the code, one can see that --preserve=true (or s/--preserve=true/--rebase=true/ > --no-rebase followed by --rebase) will override pull.rebase=preserve, > but it would be hard for someone to guess this. One could imagine > people thinking that --rebase alone would intuitively override > pull.rebase=preserve, or that --preserve=no-preserve would do so, but > that's getting ugly. -- 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