From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Aug 2010 06:27:29 +0000 (-0700)
Subject: Merge branch 'en/rebase-against-rebase-fix'
X-Git-Tag: v1.7.3-rc0~53
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d25c72f7da5116f7b7a1f88a59d2bc14415a03b2;p=git.git

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

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

d25c72f7da5116f7b7a1f88a59d2bc14415a03b2