projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 01df529) | patch
git-merge-tree: generalize the "traverse <n> trees in sync" functionality
authorLinus Torvalds <torvalds@osdl.org>
Thu, 16 Feb 2006 03:25:32 +0000 (19:25 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 16 Feb 2006 07:39:11 +0000 (23:39 -0800)
commit164dcb97f0cd1accaec4ed40c24881f8e9ae4371
tree7c77a578961358c38c7d6061f5190a79a8b08765tree | snapshot
parent01df529722618a78d2acf6159c7b1e65f565cabccommit | diff
git-merge-tree: generalize the "traverse <n> trees in sync" functionality

It's actually very useful for other things too. Notably, we could do the
combined diff a lot more efficiently with this.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-tree.c diff | blob | history
The core git plumbing