Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'en/rebase-against-rebase-fix'
author
Junio C Hamano
<gitster@pobox.com>
Sun, 22 Aug 2010 06:27:29 +0000
(23:27 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 22 Aug 2010 06:27:29 +0000
(23:27 -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
raw
(from:
d25c72f
)
No differences found