Re: Multi-ancestor read-tree notes

From: Matthias Urlichs <>
Date: 2005-09-12 02:45:10
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 @   |
Disclaimer: The quote was selected randomly. Really. |
 - -
"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

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at
Received on Mon Sep 12 02:47:56 2005

This archive was generated by hypermail 2.1.8 : 2005-09-12 02:47:58 EST