On 11:59 AM, Jonathan Nieder wrote: > Eugene Sajine wrote: > >> So, I just have to run git pull --rebase to get my scenario working, right? > > 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" Anyone else see the value of something like this? -- 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