On Sat, Feb 03, 2007 at 03:01:59PM -0800, Junio C Hamano wrote: > > 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. I was one of the major pushers of this feature in December; however, I think it actually can create some confusing results. See: http://article.gmane.org/gmane.comp.version-control.git/35789 I still think it is worth pursuing, but I have been waiting for v1.5.0 to happen before stirring up more trouble. Regardless, I think this implementation is not the right way to go about it, and you should revert 80c79776. -Peff - 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