On Mon, May 22, 2006 at 11:01:20AM +0200, Jakub Narebski wrote: > Junio C Hamano wrote: > > 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. Even then I had the impression that stages were pretty much invisible to users. So that should stay in core-tutorial.txt. Which could use some revision (Junio had some ideas) but I'm personally more interested in end-user documentation than developer documentation for now. So I'd imagined future tutorial parts cannibalizing everyday.txt and the howto's. --b. - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html