Junio C Hamano <junkio@xxxxxxx> writes: > Once you place something like "branch.*.merge" in configuration > file (either $GIT_DIR/config, or a $GIT_DIR/remotes/* file), you > are talking about other repositories you regularly interact > with, so it might be probably Ok to require the user to use a > tracking branch if he wants the convenience of "branch.*.merge", > and make its value name the local tracking branch instead of the > remote branch. 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. - 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