From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Sun, 19 May 2013 11:51:12 GMT
Subject: Re: [PATCH] fetch: add new fetch.default configuration
Message-ID: <CALkWK0nQzEK6-E7aMnGg6eYZJ_=XsE6FBmRgu9_8jBGkYmJe+Q@mail.gmail.com>
In-Reply-To: <CAMP44s3pZYw87awogjjOdFRP39Ou0=td2erhV2-aC-9_A_Z75A@mail.gmail.com>

Felipe Contreras wrote:
> % git checkout fc/remote/hg-next
> % git rebase -i # rebase to master
> % git checkout fc/remote/hg-notes
> % git rebase -i # rebase to fc/remote/hg-next
> % git checkout fc/remote/hg-gitifyhg-compat
> % git rebase -i # rebase to fc/remote/hg-notes

So it is rebase, but rebase.defaultUpstream = origin won't suffice.
You want to specify a custom base.  What I don't understand is why
you're abusing @{u}, and crippling remote (by hard-interpreting it as
"origin") to achieve this.  For the record, I didn't think your
branch.<name>.base was a bad idea at all (re-visiting now).