Git development
 help / color / mirror / Atom feed
From: Paul Mackerras <paulus@samba.org>
To: git@vger.kernel.org
Subject: Version of dirdiff to display diffs between git trees
Date: Fri, 6 May 2005 23:18:30 +1000	[thread overview]
Message-ID: <17019.28326.351036.268948@cargo.ozlabs.ibm.com> (raw)

I have adapted my "dirdiff" program to be able to display differences
between git trees (without checking them out).  It can display the
differences between up to 5 trees, each of which can be either a git
tree (identified by a tree id, a commit id or a tag) or the working
directory.

The main window summarizes which files have changed.  Double-clicking
on a file name pops up a diff viewer window which displays the
differences between the different versions of the file in a
color-coded unidiff format.  I find it useful to copy .git/HEAD to
.git/OLD_HEAD before doing an update on my linux-2.6 repository, and
then after the update do

	girdiff OLD_HEAD HEAD

to see what has changed.  With the file list I can easily skip over
files that I'm not interested in and then use the diff viewer to look
at changes to files that I do care about.

I have called this version "girdiff" to distinguish it from my normal
dirdiff releases.  It is available at:

	http://ozlabs.org/~paulus/girdiff

If invoked as girdiff, or if invoked as dirdiff and the -g flag is
given, it will interpret its arguments as git trees rather than
directory or file names.  As a special case, the working directory is
indicated by ".".

This is still under development and there are probably bugs - let me
know if you find any.

Paul.




             reply	other threads:[~2005-05-06 13:11 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-05-06 13:18 Paul Mackerras [this message]
2005-05-06 16:19 ` Version of dirdiff to display diffs between git trees Linus Torvalds
2005-05-06 18:53   ` Krzysztof Halasa
2005-05-06 19:07     ` Linus Torvalds
2005-05-07  0:01   ` Paul Mackerras

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=17019.28326.351036.268948@cargo.ozlabs.ibm.com \
    --to=paulus@samba.org \
    --cc=git@vger.kernel.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