From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 1 Sep 2010 20:43:55 +0000 (-0700)
Subject: Merge branch 'en/rebase-against-rebase-fix' into maint
X-Git-Tag: v1.7.2.3~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=061219fa7cf1063ac7f0dace55e8d175c7a91879;p=git.git

Merge branch 'en/rebase-against-rebase-fix' into maint

* en/rebase-against-rebase-fix:
  pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
  t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
---

061219fa7cf1063ac7f0dace55e8d175c7a91879