Merge branch 'sb/pull-rebase' into next
commit665dcca75908765125a51be9ea74fba76de3c432
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Jul 2009 20:03:23 +0000 (19 13:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Jul 2009 20:03:23 +0000 (19 13:03 -0700)
tree49a9ccbd879388f7c298079a76aa67ab3e251345
parentc4640b1ab5e9a2e9a8f9cc8b86d1ce0c7a695aa2
parentd44e71261f91d3cc81293e0976bb40daa8abb583
Merge branch 'sb/pull-rebase' into next

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