]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit061219fa7cf1063ac7f0dace55e8d175c7a91879
tree18a4084832d40e2da609753af4bf504acb143667tree | snapshot
parentd3fd3d1f9bbb454864bd004dc3f29f99e4087889commit | diff
parentcf65426de682bf4e336eddd2964a7c1585597f48commit | diff
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
git-pull.sh diff1 | diff2 | blob | history
t/t5520-pull.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.