Merge branch 'ds/branch-auto-rebase'
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 May 2008 21:16:33 +0000 (14:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 May 2008 21:16:33 +0000 (14:16 -0700)
* ds/branch-auto-rebase:
  Allow tracking branches to set up rebase by default.


Trivial merge