projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 64646d1) | patch
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)
commit9e11554917d391c18e043bc0b38ee0377e69568e
treeccb0eea6c3a68f8b54dfc0f31d59c7824f0b8272tree | snapshot
parent64646d11773774193093df96020d3fcb0df4a270commit | diff
Revert "git-pull: refuse default merge without branch.*.merge"

This reverts commit a71fb0a1412c82405f078fb536797d3f5de68d53.

The logic to decide when to refuse to use the default "first set of
refs fetched" for merge was utterly bogus.

In a repository that happily worked correctly without any of the
per-branch configuration crap did not have (and did not have to
have) any branch.<current>.merge.  With that broken commit, pulling
from origin no longer would work.
git-parse-remote.sh diff | blob | history
Git—the stupid content tracker