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

Re: [PATCH 6/5] git-diff.txt: banish the <commit>..<commit> form

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 24, 2013, 18:29 UTC
Message-ID
<7vip3bdbpg.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1366822980-21926-1-git-send-email-artagnon@gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
Show 23 quoted lines
> The '<commit>..<commit>' and '<commit>...<commit>' forms are confusing
> as they are reminiscent of the corresponding forms in the "SPECIFYING
> RANGES" section of revisions.txt.  We can remove the
> '<commit>..<commit>' form now (hence discouraging its use), since it
> is exactly equivalent to the clearer '<commit> <commit>' form.
> However, we must keep the '<commit>...<commit>' form around until we
> can find a different way to express the same thing.
>
> Suggested-by: Junio C Hamano <gitster@pobox.com>
> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
> ---
>  Documentation/git-diff.txt | 21 ++++++---------------
>  1 file changed, 6 insertions(+), 15 deletions(-)
>
> diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
> index 1f2f681..118b448 100644
> --- a/Documentation/git-diff.txt
> +++ b/Documentation/git-diff.txt
> @@ -14,7 +14,6 @@ SYNOPSIS
>  'git diff' [options] --cached [<commit>] [[--] [<path>...]]
>  'git diff' [options] <blob> <blob>
>  'git diff' [options] <commit> <commit> [[--] [<path>...]]
> -'git diff' [options] <commit>..<commit> [[--] [<path>...]]

I agree with the end result not to list .. form in the SYNOPSIS, but you shouldn't have added it in the first place in the earlier patch.

Show 12 quoted lines
>  'git diff' [options] <commit>\...<commit> [[--] [<path>...]]
>  
>  DESCRIPTION
> @@ -63,12 +62,6 @@ directories. This behavior can be forced by --no-index.
>  	This is to view the changes between two arbitrary
>  	<commit>.
>  
> -'git diff' [options] <commit>..<commit> [[--] [<path>...]]::
> -
> -	This is synonymous to the previous form.  If <commit> on
> -	one side is omitted, it will have the same effect as
> -	using HEAD instead.

I do not think it is a bad idea to drop this enumerated item, but I would have expected a sidenote to be added for the description for "git diff A B" form, so that people who saw "git diff A..B" somewhere on the web and wonder what it means can look it up.

Previous: Ramkumar RamachandraNext: Ramkumar Ramachandra
Message 32 of 39 in “Documentation/git-diff.txt improvements”
  1. 0/5 Documentation/git-diff.txt improvementsRamkumar Ramachandra, Apr 24, 2013
  2. 1/5 git-diff.txt: reorder the <commit> <commit> formRamkumar Ramachandra, Apr 24, 2013
  3. Jonathan NiederApr 24, 2013
  4. 2/5 git-diff.txt: strip the leading "--" from options templateRamkumar Ramachandra, Apr 24, 2013
  5. Jonathan NiederApr 24, 2013
  6. Ramkumar RamachandraApr 24, 2013
  7. Junio C HamanoApr 24, 2013
  8. 3/5 git-diff.txt: group the [--] and [<path>...] templatesRamkumar Ramachandra, Apr 24, 2013
  9. Junio C HamanoApr 24, 2013
  10. Ramkumar RamachandraApr 24, 2013
  11. Junio C HamanoApr 24, 2013
  12. Ramkumar RamachandraApr 24, 2013
  13. Junio C HamanoApr 24, 2013
  14. Ramkumar RamachandraApr 24, 2013
  15. Jonathan NiederApr 24, 2013
  16. 4/5 git-diff.txt: document the .. and ... forms in SYNOPSISRamkumar Ramachandra, Apr 24, 2013
  17. Jonathan NiederApr 24, 2013
  18. 5/5 git-diff.txt: fix ordering of the [--no-index] formRamkumar Ramachandra, Apr 24, 2013
  19. Junio C HamanoApr 24, 2013
  20. Ramkumar RamachandraApr 24, 2013
  21. Jonathan NiederApr 24, 2013
  22. Ramkumar RamachandraApr 24, 2013
  23. Jonathan NiederApr 24, 2013
  24. Ramkumar RamachandraApr 24, 2013
  25. Jonathan NiederApr 24, 2013
  26. Ramkumar RamachandraApr 24, 2013
  27. Jonathan NiederApr 24, 2013
  28. Ramkumar RamachandraApr 24, 2013
  29. Jonathan NiederApr 24, 2013
  30. Ramkumar RamachandraApr 24, 2013
  31. 6/5 git-diff.txt: banish the <commit>..<commit> formRamkumar Ramachandra, Apr 24, 2013
  32. Junio C HamanoApr 24, 2013
  33. Ramkumar RamachandraApr 24, 2013
  34. Ramkumar RamachandraApr 25, 2013
  35. Junio C HamanoApr 29, 2013
  36. Ramkumar RamachandraApr 29, 2013
  37. Junio C HamanoApr 29, 2013
  38. Ramkumar RamachandraApr 29, 2013
  39. Junio C HamanoApr 29, 2013

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.