commit | 80c797764a6b6a373f0f1f47d7f56b0d950418a9 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <junkio@cox.net> | Sun Dec 24 01:59:53 2006 -0800 |
committer | Junio C Hamano <junkio@cox.net> | Sun Dec 24 02:18:57 2006 -0800 |
tree | a9e9b864fb4bb051f87c6b0bb5985122b5dc1868 | |
parent | e036c90a913889dfa8097ebe73b619370e0c6f32 [diff] |
Allow branch.*.merge to talk about remote tracking branches. People often get confused if the value of branch.*.merge should be the remote branch name they are fetching from, or the tracking branch they locally have. So this allows either. Signed-off-by: Junio C Hamano <junkio@cox.net>