[PATCH 0/2] Fix spurious conflicts with pull --rebase

This patch series fixes git pull --rebase failing to detect if "local" patches are already upstream in cases where the upstream repository is not itself rebased. Also in the non-rebased upstream case, this series avoids checking/applying more patches than needed (i.e. avoids having rebase work on commits which are already reachable from upstream).

It would be nice to make 'git pull --rebase' able to detect if patches being applied are already part of upstream in cases where the upstream repository has been rebased. As far as I can tell, that would require changes to format-patch to allow it to be told what 'upstream' is, and some changes to git-pull.sh/git-rebase.sh to pass it this information.

Elijah Newren (2):
  t5520-pull: Add testcases showing spurious conflicts from git pull
    --rebase
  pull --rebase: Avoid spurious conflicts and reapplying unnecessary
    patches

 git-pull.sh     |   34 ++++++++++++++++++++-----------
 t/t5520-pull.sh |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 12 deletions(-)