From: Junio C Hamano <junkio@cox.net>
Date: Tue, 26 Dec 2006 02:08:01 +0000 (-0800)
Subject: Merge branch 'jc/bm'
X-Git-Tag: v1.5.0-rc0~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d2bafe5c320c1204b264dc25392a3fc35ed57153;p=git.git

Merge branch 'jc/bm'

* jc/bm:
  Allow branch.*.merge to talk about remote tracking branches.
---

d2bafe5c320c1204b264dc25392a3fc35ed57153