]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sb/branch-attributes'
authorJunio C Hamano <junkio@cox.net>
Mon, 25 Sep 2006 02:20:26 +0000 (19:20 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 25 Sep 2006 02:20:26 +0000 (19:20 -0700)
* 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


Trivial merge