projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e036c90) | patch
Allow branch.*.merge to talk about remote tracking branches.
authorJunio C Hamano <junkio@cox.net>
Sun, 24 Dec 2006 09:59:53 +0000 (01:59 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 24 Dec 2006 10:18:57 +0000 (02:18 -0800)
commit80c797764a6b6a373f0f1f47d7f56b0d950418a9
treea9e9b864fb4bb051f87c6b0bb5985122b5dc1868tree | snapshot
parente036c90a913889dfa8097ebe73b619370e0c6f32commit | 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>
git-parse-remote.sh diff | blob | history
Git—the stupid content tracker