![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Sep 2010 20:43:55 +0000 (13:43 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Sep 2010 20:43:55 +0000 (13:43 -0700) | ||
| commit | 061219fa7cf1063ac7f0dace55e8d175c7a91879 | |
| tree | 18a4084832d40e2da609753af4bf504acb143667 | tree | snapshot |
| parent | d3fd3d1f9bbb454864bd004dc3f29f99e4087889 | commit | diff |
| parent | cf65426de682bf4e336eddd2964a7c1585597f48 | commit | 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
* 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 |