In other words, I am all for fixing this. Although it may not hurt too much if we just redefine the meaning of it to name the local tracking branch, using a different name "branch.*.defaultmerge" is safer and would not break existing repositories. -

Hmm... that's true; actually, I did not thought about people which do not want to have any tracking branches (again!). So [remote "repo"] url = ... fetch = branch1 fetch = branch2 [branch "mybranch1"] remote = repo merge = branch1 actually looks fine, and is the only possible way. But still, this does not work. You have to specify merge = refs/heads/branch1 That's confusing (perhaps I can come up with a patch to allow "branch1" alone). So probably the best way is to w...

For the git-svn in master using the delta fetcher; there's no additional overhead to fetch properties. I want to ditch the old non-delta fetching code (it's only a mild performance benefit when using local repositories) if I could get do_switch() working correctly. -- Eric Wong -