diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-24 01:59:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-24 02:18:57 -0800 |
| commit | 80c797764a6b6a373f0f1f47d7f56b0d950418a9 (patch) | |
| tree | a9e9b864fb4bb051f87c6b0bb5985122b5dc1868 /commit.c | |
| parent | Merge branch 'sb/merge-friendly' (diff) | |
| download | git-80c797764a6b6a373f0f1f47d7f56b0d950418a9.tar.gz git-80c797764a6b6a373f0f1f47d7f56b0d950418a9.zip | |
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions