Skip to content

Commit

Permalink
Merge branch 'jc/bm'
Browse files Browse the repository at this point in the history
* jc/bm:
  Allow branch.*.merge to talk about remote tracking branches.
  • Loading branch information
Junio C Hamano committed Dec 26, 2006
2 parents 6ec45f3 + 80c7977 commit d2bafe5
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions git-parse-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,12 @@ canon_refs_list_for_fetch () {
else
for merge_branch in $merge_branches
do
[ "$remote" = "$merge_branch" ] &&
dot_prefix= && break
if test "$remote" = "$merge_branch" ||
test "$local" = "$merge_branch"
then
dot_prefix=
break
fi
done
fi
case "$remote" in
Expand Down

0 comments on commit d2bafe5

Please sign in to comment.