On Wed, 24 May 2006 17:19:29 -0700 Junio C Hamano <junkio@xxxxxxx> wrote: > Linus Torvalds <torvalds@xxxxxxxx> writes: > > > On Wed, 24 May 2006, Junio C Hamano wrote: > >> > >> It was very pleasant to read the changes that way, especially around > >> write_sha1_to_fd() vs repack_object(). xxdiff is my new friend. > > > > I think "kompare" (the KDE diff tool) is nicer. > > I'd love to give it a whirl, but aptitude says it will consume > 73.5MB diskspace to install it, with download size 22.4MB, which > makes me go ... hmmmm (my machines are currently KDE free so the > above counts slurping in the kdelibs essentials). > "meld" works great too, and lets you do hunk-level merging etc; very handy. The bash <( ... ) feature is quite handy too, it will create a temp file for you and clean it up afterward. $ meld sha1_file.c <(git cat-file -p c2f493a4ae:sha1_file.c) Sean - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html