diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-26 05:08:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-26 05:08:01 +0300 |
| commit | d2bafe5c320c1204b264dc25392a3fc35ed57153 (patch) | |
| tree | bcb53fc2d263302e05c50b3332adbedca562599e /cache.h | |
| parent | 6ec45f3bd180ed0404733d0f5c648691245cf571 (diff) | |
| parent | 80c797764a6b6a373f0f1f47d7f56b0d950418a9 (diff) | |
Merge branch 'jc/bm'
* jc/bm:
Allow branch.*.merge to talk about remote tracking branches.
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions