picca, Tue, May 15, 2007 11:38:20 +0200: > So I do a merge like this > "git merge upstream ." when I am on the master branch to work on the new > package. loose the dot. git-merge syntax is "git merge branch1 [branch2...]" - 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