Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".

Yann Dirson [off-list ref] writes:

On Fri, Feb 02, 2007 at 11:25:28PM +0000, Catalin Marinas wrote:

quoted

OK, tried again and 'stg pull' doesn't update the base with the last
patch in the series ('stg rebase origin' updates it). I don't have
anything set up in my gitconfig in this area.

So now that this particular problem has a fix, let's fix everything
related.

Since branch.*.merge accept local ref names, there is probably far
more to change that what I initially feared.

If that is the case maybe we should fix branch.*.merge not to
match the local tracking branch name.  Matching it with local
tracking branch name when the remote name does not match was
werely a fallback to help broken configurations confused people
might create by hand, and has never been the part of sane
practice at all.