On Saturday 25 November 2006 22:53, Junio C Hamano wrote: > - merging the "primary" branch is good only when the user is on > the corresponding "primary" branch. It is usually a wrong > thing to do when on another branch. I vote for a config option core.pull.stopWithoutDefaultMerge which would error out on a git pull when no branch.<current branch>.merge is set with a message like "No default remote branch set to merge into current branch <branch>. Set branch.<branch>.remote/merge to make this work" It is arguable if this option should change the behavior of "git pull <repo>". Probably not: I would assume that the user explicitly wants to merge the primary branch of <repo>. Additionally, set branch.<primary>.remote/merge on git-clone, together with core.pull.stopWithoutDefaultMerge=1. Josef - 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