From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Aug 2009 18:33:08 +0000 (-0700)
Subject: Merge branch 'sb/maint-pull-rebase' into maint
X-Git-Tag: v1.6.4.1~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=07d6309e63aa272d2930540faa72147dc5be97a5;p=git.git

Merge branch 'sb/maint-pull-rebase' into maint

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

07d6309e63aa272d2930540faa72147dc5be97a5