projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e4bcaac) | patch
[PATCH] A test case that demonstrates a problem with merges with two roots.
authorJon Seymour <jon.seymour@gmail.com>
Thu, 23 Jun 2005 02:01:09 +0000 (12:01 +1000)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 02:15:04 +0000 (19:15 -0700)
commit6e4c0a51092e3ec3429ca91890b99e198aa367bd
tree07d7dbfa3ffe9639e994f7117232ce85fac1baa1tree | snapshot
parente4bcaac17e8959eb970a348519a25d0d396395f0commit | diff
[PATCH] A test case that demonstrates a problem with merges with two roots.

git-rev-list --merge-order is omitting one of the roots when
displaying a merge containing two distinct roots.

A subsequent patch will fix the problem.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
t/t6001-rev-list-merge-order.sh [changed mode: 0644->0755] diff | blob | history
The core git plumbing