From: Junio C Hamano <junkio@cox.net>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/3] tutorial: expanded discussion of commit history
Date: Mon, 22 May 2006 01:45:11 -0700 [thread overview]
Message-ID: <7vzmhacuso.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: e4rsef$v34$1@sea.gmane.org
Jakub Narebski <jnareb@gmail.com> writes:
> J. Bruce Fields wrote:
>
>> +Finally, most commands that take filenames will optionally allow you
>> +to precede any filename by a commit, to specify a particular version
>> +fo the file:
>> +
>> +-------------------------------------
>> +$ git diff v2.5:Makefile HEAD:Makefile.in
>> +-------------------------------------
>
> Why not mention also :<stage>:<filename>, or would <stage> be not defined in
> this place of tutorial?
I do not think being able to do diff with arbitrary stage is
often used in practice. By definition, you would want to do
diff with a stage during a conflicted merge, and most of the
time the default combined diff without any colon form should
give you the most useful results. Also, ":<path>" to mean the
entry in the index is often equivalent to "git diff --cached".
IOW, these are obscure special purpose notation, and I do not
think tutorial is a good place to cover them.
next prev parent reply other threads:[~2006-05-22 8:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-21 23:53 (unknown) J. Bruce Fields
2006-05-21 23:53 ` (unknown) J. Bruce Fields
2006-05-21 23:53 ` (unknown) J. Bruce Fields
2006-05-22 0:35 ` totorial-2 (unknown) Junio C Hamano
2006-05-22 1:25 ` J. Bruce Fields
2006-05-22 15:27 ` [PATCH 3/3] tutorial: add discussion of index file, object database Jakub Narebski
2006-05-22 8:23 ` [PATCH 2/3] tutorial: expanded discussion of commit history Jakub Narebski
2006-05-22 8:45 ` Junio C Hamano [this message]
2006-05-22 9:01 ` Jakub Narebski
2006-05-22 14:18 ` J. Bruce Fields
2006-05-21 23:55 ` your mail J. Bruce Fields
2006-05-22 0:16 ` Junio C Hamano
2006-05-22 1:33 ` J. Bruce Fields
2006-05-22 10:09 ` [PATCH] git help: remove whatchanged from list of common commands Martin Waitz
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=7vzmhacuso.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/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).