projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4d3a63b) | patch
[PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)
authorJon Seymour <jon.seymour@gmail.com>
Wed, 6 Jul 2005 16:39:35 +0000 (02:39 +1000)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 6 Jul 2005 17:29:30 +0000 (10:29 -0700)
commitff9206e72c71aa2e51c7cbee911f47b5838a5845
treed4f74f740dfcb97670df7b69e64b252149db2bfbtree | snapshot
parent4d3a63ba3a1f80e03312c5ec28734b27583a0756commit | diff
[PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)

This patch passes the test case introduced by the previous patch.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
epoch.c diff | blob | history
The core git plumbing