Re: [PATCH 2/3] tutorial: expanded discussion of commit history
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- May 22, 2006, 09:01 UTC
- Message-ID
- <e4ruku$5uk$1@sea.gmane.org>
- In-Reply-To
- <7vzmhacuso.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
Show 13 quoted lines
> 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
Show 11 quoted lines
>> 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.
Hmmm... perhaps in tutorial-3.txt, covering merges and how to resolve conflicted merge, cherry picking, reverting and rebasing. And of course some git workflows covering usage of branches (including pull/push, fast-forward and "union" branches like 'pu' branch in git).
Well, perhaps not tutorial, but Git Cookbook, or Git Receipies, or Git Usage Examples,...
-- Jakub Narebski Warsaw, Poland