Andrew's git / gitweb.git / diff
?
Merge branch 'sb/maint-pull-rebase' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Aug 2009 18:33:08 +0000 (11:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Aug 2009 18:33:08 +0000 (11:33 -0700)
* sb/maint-pull-rebase:
pull: support rebased upstream + fetch + pull --rebase
t5520-pull: Test for rebased upstream + fetch + pull --rebase

Trivial merge