From: Eric Raible <raible@gmail.com>
Date: Thu, 10 Jun 2010 19:01:34 GMT
Subject: [RFH] specifying rebase options when branch.<name>.rebase = true
Message-ID: <AANLkTimbBZVWk2EzXIngSV6Kblap1k8mPbfEa8OOGxUh@mail.gmail.com>

In setting up our rebase-based workflow I'd like people
to simply use "git pull".  But "branch.<name>.rebase=true"
gets me only halfway there.

The problem is that I'd like to rebase local merges as well,
but have not seen a was to specify the --preserve-merges flag.

Am I missing something obvious?