Merge branch 'sb/maint-pull-rebase' into jch
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2009 06:11:15 +0000 (23:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2009 06:11:15 +0000 (23:11 -0700)
commitc083916de09e6d8ed4a63d04a0cc0d77972ce068
treecac5f87151b274f1aaf257291296fa7a67053cb7
parent488ddd34befbde70fd5eeb1f22f56316e14c45f7
parentd44e71261f91d3cc81293e0976bb40daa8abb583
Merge branch 'sb/maint-pull-rebase' into jch

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