mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
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>
This commit is contained in:
parent
e036c90a91
commit
80c797764a
1 changed files with 6 additions and 2 deletions
|
@ -146,8 +146,12 @@ canon_refs_list_for_fetch () {
|
||||||
else
|
else
|
||||||
for merge_branch in $merge_branches
|
for merge_branch in $merge_branches
|
||||||
do
|
do
|
||||||
[ "$remote" = "$merge_branch" ] &&
|
if test "$remote" = "$merge_branch" ||
|
||||||
dot_prefix= && break
|
test "$local" = "$merge_branch"
|
||||||
|
then
|
||||||
|
dot_prefix=
|
||||||
|
break
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
case "$remote" in
|
case "$remote" in
|
||||||
|
|
Loading…
Reference in a new issue