From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] Cleanup git-diff documentation
Date: Fri, 15 Dec 2006 11:03:19 +0100 [thread overview]
Message-ID: <eltroi$b4q$3@sea.gmane.org> (raw)
In-Reply-To: 9A80051B-1F6B-4FFD-B33F-84121D3A422F@silverinsanity.com
Brian Gernhardt wrote:
> -This command shows changes between four combinations of states.
> +Show changes between two trees, a tree and the working tree, a
> +tree and the index file, or the index file and the working tree.
> +The combination of what is compared with what is determined by
> +the number of trees given to the command.
You talk here about "number of _trees_" while later you use <commit>,
not <tree> or <tree-ish>. Only at the very end you say that <commit>
(<commit-ish> because you can use tags as well) can be replaced by
any <tree-ish>.
That said, I like this clarification, especially the fact that
I don't have to go to git-diff-tree(1) to find diff options.
> 'git-diff' [--options] [--] [<path>...]::
> @@ -25,11 +28,11 @@ This command shows changes between four
> combinations of states.
> 'git-diff' [--options] --cached [<commit>] [--] [<path>...]::
> This form is to view the changes you staged for the next
> - commit relative to the named <tree-ish>. Typically you
> + commit relative to the named <commit>. Typically you
> would want comparison with the latest commit, so if you
> do not give <commit>, it defaults to HEAD.
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-12-15 10:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-14 8:09 [PATCH] Update git-diff documentation Junio C Hamano
2006-12-14 8:59 ` Johannes Schindelin
2006-12-14 12:32 ` [PATCH] Cleanup " Brian Gernhardt
2006-12-15 10:03 ` Jakub Narebski [this message]
2006-12-14 17:02 ` [PATCH] Update " Nicolas Pitre
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='eltroi$b4q$3@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).