From: Junio C Hamano <junkio@cox.net>
Date: Mon, 25 Sep 2006 02:20:26 +0000 (-0700)
Subject: Merge branch 'sb/branch-attributes'
X-Git-Tag: v1.4.3-rc1~44
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=700899b624f368af6f2322fc10c6a0350d398694;p=git.git

Merge branch 'sb/branch-attributes'

* sb/branch-attributes:
  Add test for the default merges in fetch.
  fetch: get the remote branches to merge from the branch properties
  Add t5510 to test per branch configuration affecting git-fetch.
  Fetch: default remote repository from branch properties
---

700899b624f368af6f2322fc10c6a0350d398694