projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 043c041 6cc7c36)
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)
commit700899b624f368af6f2322fc10c6a0350d398694
tree8fae533f54b87636539a0cc89ae1419b18c925a9tree | snapshot
parent043c04107c5e55224b4517a43c5c40ba18a617d0commit | diff
parent6cc7c36d5e2fd89be596a164bcc2afede9d855d3commit | diff
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
Git—the stupid content tracker