projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2f3f8b2) | patch
git-pickaxe: simplify Octopus merges further
authorJunio C Hamano <junkio@cox.net>
Sat, 4 Nov 2006 20:20:09 +0000 (12:20 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 4 Nov 2006 20:20:18 +0000 (12:20 -0800)
commit0421d9f812acc819dcf9e9c6707618aca7e80bf4
tree495875a4e5b5f76c98f2ebe6de3f2e41a332e78dtree | snapshot
parent2f3f8b218abae6fc0574d0e22d3614fc0f5e983dcommit | diff
git-pickaxe: simplify Octopus merges further

If more than one parents in an Octopus merge have the same
origin, ignore later ones because it would not make any
difference in the outcome.

Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-pickaxe.c diff | blob | history
Git—the stupid content tracker