Eric Raible <raible@xxxxxxxxxxx> wrote: > On 11:59 AM, Jonathan Nieder wrote: > > > Maybe the "[branch "<name>"] rebase" and "[branch] autosetuprebase" > > configuration items could help. > > One frustrating aspect of branch.<name>.rebase is that AFAIK > there's no way for it to preserve merges. > > I would much prefer if branch.<name>.rebase was allowed to > specify the arguments to be passed to rebase: > > git config branch.mybranch.rebase "-i --preserve-merges" For me it would be good enough if there were some way of making "pull --rebase" error out in the case that merges are involved. I'll then either do a pull --no-rebase, or deal with the situation in some other way; but getting the merge "flattened" by "git pull" without being told about it is what's frustrating to me. -- Stefan Haller Berlin, Germany http://www.haller-berlin.de/ -- 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