Code

Merge branch 'sb/maint-pull-rebase'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2009 19:38:39 +0000 (12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2009 19:38:39 +0000 (12:38 -0700)
commite3e9af5baefff0ad6ab683dae438111db626a6c6
tree9edcb0f8951ac0725a886c9203246d501f7eebb9
parent7d1b50981277c59a788298751f121567a1e75202
parentd44e71261f91d3cc81293e0976bb40daa8abb583
Merge branch 'sb/maint-pull-rebase'

* sb/maint-pull-rebase:
  pull: support rebased upstream + fetch + pull --rebase
  t5520-pull: Test for rebased upstream + fetch + pull --rebase