From: Sean <seanlkml@sympatico.ca>
To: Junio C Hamano <junkio@cox.net>
Cc: torvalds@osdl.org, git@vger.kernel.org
Subject: Re: Clean up sha1 file writing
Date: Wed, 24 May 2006 20:31:08 -0400 [thread overview]
Message-ID: <BAYC1-PASMTP1121D710ADAA95C7B2D8E4AE990@CEZ.ICE> (raw)
Message-ID: <20060524203108.70b6c596.seanlkml@sympatico.ca> (raw)
In-Reply-To: <7virnv3qi6.fsf@assigned-by-dhcp.cox.net>
On Wed, 24 May 2006 17:19:29 -0700
Junio C Hamano <junkio@cox.net> wrote:
> Linus Torvalds <torvalds@osdl.org> 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
next prev parent reply other threads:[~2006-05-25 0:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-24 15:30 Clean up sha1 file writing Linus Torvalds
2006-05-24 18:14 ` Matthias Lederhofer
2006-05-24 18:52 ` Linus Torvalds
2006-06-02 18:44 ` H. Peter Anvin
2006-06-02 21:17 ` Linus Torvalds
2006-06-04 18:25 ` H. Peter Anvin
2006-06-04 18:39 ` Linus Torvalds
2006-06-04 18:40 ` Linus Torvalds
2006-06-04 19:05 ` H. Peter Anvin
2006-05-24 20:46 ` Junio C Hamano
2006-05-24 23:35 ` Linus Torvalds
2006-05-25 0:19 ` Junio C Hamano
[not found] ` <20060524203108.70b6c596.seanlkml@sympatico.ca>
2006-05-25 0:31 ` Sean [this message]
2006-05-25 1:22 ` [PATCH] cat-file: document -p option Jeff King
2006-05-26 5:36 ` Clean up sha1 file writing Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BAYC1-PASMTP1121D710ADAA95C7B2D8E4AE990@CEZ.ICE \
--to=seanlkml@sympatico.ca \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).