Re: Multi-ancestor read-tree notes

From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Sep 11, 2005, 16:45 UTC
Message-ID: <pan.2005.09.11.16.45.08.244699@smurf.noris.de>
In-Reply-To: <Pine.LNX.4.63.0509091337460.23242@iabervon.org>

Hi, Daniel Barkalow wrote:

>  I'm actually interested in doing a big spiffy program 
> to do merges with information drawn as needed from the history, stuff 
> happening on a per-hunk level, and support for block moves.

You should look at "meld", which is a nice Python program to do graphical merges.

In addition to that, I've written a Python interface for direct (read-only) access to git objects, so you can do more interesting things without forking off a lot of programs. Expect that work to appear here shortly.

-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
"The majority of the stupid is invincible and guaranteed for all time. The
terror of their tyranny, however, is alleviated by their lack of consistency."
-- Albert Einstein