]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d3fd3d1 cf65426)
Merge branch 'en/rebase-against-rebase-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Sep 2010 20:43:55 +0000 (13:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Sep 2010 20:43:55 +0000 (13:43 -0700)
* 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

1  2 
git-pull.sh patch | diff1 | diff2 | blob | history
t/t5520-pull.sh patch | diff1 | diff2 | blob | history

diff --cc git-pull.sh
Simple merge
diff --cc t/t5520-pull.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.