From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [RFC] git-add update with all-0 object
Date: Sat, 02 Dec 2006 09:55:16 +0100 [thread overview]
Message-ID: <ekrets$v72$1@sea.gmane.org> (raw)
In-Reply-To: 7vhcwgcf39.fsf@assigned-by-dhcp.cox.net
Junio C Hamano wrote:
> * 'git-diff' [--options] <commit> <commit> -- [<path>...]
>
> is to see the changes between two <commit>.
>
> Just in case if you are doing something exotic, it
> should be noted that all of the <commit> in the above
> descriptoin can be any <tree-ish>.
s/descriptoin/description/
It _might_ be worth mentioning that you can compare two arbitrary
files using
git diff [--options] <blob1 sha> <blob2 sha>
where <blob sha> can be entered as <tree-ish>:<filename>, usually
<commit>:<filename> (<filename> is HEAD:<filename>) to compare blob (file)
from a named tree/from a given commit, or as :<stage>:<filename> (or
just ::<filename> if file is not in merge conflict) to compare blob (file)
from an index.
If I understand correctly there is currently no way to compare files from a
working tree, not to mention files outside working tree
(including /dev/null) with that syntax.
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-12-02 8:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-30 22:08 [RFC] git-add update with all-0 object Daniel Barkalow
2006-11-30 22:32 ` Johannes Schindelin
2006-11-30 22:34 ` Nicolas Pitre
2006-11-30 22:41 ` Jakub Narebski
2006-11-30 22:49 ` Nicolas Pitre
2006-11-30 22:46 ` Linus Torvalds
2006-12-01 0:12 ` Daniel Barkalow
2006-12-01 4:57 ` Theodore Tso
2006-12-01 6:20 ` Junio C Hamano
2006-12-02 8:55 ` Jakub Narebski [this message]
2006-12-01 7:10 ` Linus Torvalds
2006-12-01 8:10 ` Daniel Barkalow
2006-12-01 9:37 ` Andy Parkins
2006-12-02 8:35 ` Jakub Narebski
2006-12-02 8:26 ` Jakub Narebski
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='ekrets$v72$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--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;
as well as URLs for NNTP newsgroup(s).