From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Aug 2009 19:38:39 +0000 (-0700)
Subject: Merge branch 'sb/maint-pull-rebase'
X-Git-Tag: v1.6.5-rc0~112
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e3e9af5baefff0ad6ab683dae438111db626a6c6;p=git.git

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
---

e3e9af5baefff0ad6ab683dae438111db626a6c6