![[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) |
* 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
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