projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2eb5469 cf65426)
Merge branch 'en/rebase-against-rebase-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:27:29 +0000 (23:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:27:29 +0000 (23:27 -0700)
commitd25c72f7da5116f7b7a1f88a59d2bc14415a03b2
tree74d5fcea2044616ca648d60004bb24623f62997btree | snapshot
parent2eb54692d145a0c2939698302e913975f059ac34commit | diff
parentcf65426de682bf4e336eddd2964a7c1585597f48commit | diff
Merge branch 'en/rebase-against-rebase-fix'

* 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
Git—the stupid content tracker