git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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
Previous: Junio C HamanoNext: J. Bruce Fields
Message 9 of 14 in “(unknown)”
  1. J. Bruce FieldsMay 21, 2006
  2. J. Bruce FieldsMay 21, 2006
  3. J. Bruce FieldsMay 21, 2006
  4. Junio C HamanoMay 22, 2006
  5. J. Bruce FieldsMay 22, 2006
  6. Jakub NarebskiMay 22, 2006
  7. Jakub NarebskiMay 22, 2006
  8. Junio C HamanoMay 22, 2006
  9. Jakub NarebskiMay 22, 2006
  10. J. Bruce FieldsMay 22, 2006
  11. J. Bruce FieldsMay 21, 2006
  12. Junio C HamanoMay 22, 2006
  13. J. Bruce FieldsMay 22, 2006
  14. git help: remove whatchanged from list of common commandsMartin Waitz, May 22, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.