| commit | 80c797764a6b6a373f0f1f47d7f56b0d950418a9 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 24 Dec 2006 09:59:53 +0000 (24 01:59 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 24 Dec 2006 10:18:57 +0000 (24 02:18 -0800) | ||
| tree | a9e9b864fb4bb051f87c6b0bb5985122b5dc1868 | treesnapshot (tar.gz zip) |
| parent | e036c90a913889dfa8097ebe73b619370e0c6f32 | commitdiff |
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>
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>
| git-parse-remote.sh | diffblobblamehistory |