Revert "git-pull: refuse default merge without branch.*.merge"
authorJunio C Hamano <junkio@cox.net>
Fri, 22 Dec 2006 06:10:56 +0000 (22:10 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 22 Dec 2006 06:12:42 +0000 (22:12 -0800)
commit9e11554...17d391c18e043bc0b38ee0377e69568e
treeccb0eea...c3a68f8b54dfc0f31d59c7824f0b8272copy hash to clipboard (tree)
parent64646d1...773774193093df96020d3fcb0df4a270copy hash to clipboard (diff)
git-parse-remote.sh