summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-25 18:08:01 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-25 18:08:01 -0800
commitd2bafe5c320c1204b264dc25392a3fc35ed57153 (patch)
treebcb53fc2d263302e05c50b3332adbedca562599e /GIT-VERSION-GEN
parent6ec45f3bd180ed0404733d0f5c648691245cf571 (diff)
parent80c797764a6b6a373f0f1f47d7f56b0d950418a9 (diff)
downloadgit-d2bafe5c320c1204b264dc25392a3fc35ed57153.tar.gz
Merge branch 'jc/bm'
* jc/bm: Allow branch.*.merge to talk about remote tracking branches.
Diffstat (limited to 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions