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

[PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

From
Andreas Heiduk <asheiduk@gmail.com>
Date
Apr 10, 2018, 18:32 UTC
Message-ID
<20180410183224.10780-3-asheiduk@gmail.com>
In-Reply-To
<20180410183224.10780-1-asheiduk@gmail.com>

Comparing The two '<path>' parameters are not optional but the option '--no-index' is. Also move the `--options` part to the same place where the other variants show them.

All three items are already correct in the synopsis.
Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
---
 Documentation/git-diff.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index b0c1bb95c8..ee1c509bd3 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -29,7 +29,7 @@ two blob objects, or changes between two files on disk.
 	further add to the index but you still haven't.  You can
 	stage these changes by using linkgit:git-add[1].
 
-'git diff' --no-index [--options] [--] [<path>...]::
+'git diff' [--options] [--no-index] [--] <path> <path>::
 
 	This form is to compare the given two paths on the
 	filesystem.  You can omit the `--no-index` option when
-- 
2.16.2
Previous: Andreas HeidukNext: Martin Ågren
Message 7 of 54 in “Some doc-fixes”
  1. 0/6 Some doc-fixesAndreas Heiduk, Apr 10, 2018
  2. 4/6 doc: added '-d' and '-q' for 'git push'Andreas Heiduk, Apr 10, 2018
  3. Martin ÅgrenApr 10, 2018
  4. Andreas HeidukApr 10, 2018
  5. Martin ÅgrenApr 10, 2018
  6. 3/6 doc: clarify ignore rules for git ls-filesAndreas Heiduk, Apr 10, 2018
  7. 2/6 doc: align 'diff --no-index' in text with synopsisAndreas Heiduk, Apr 10, 2018
  8. Martin ÅgrenApr 10, 2018
  9. Andreas HeidukApr 10, 2018
  10. Junio C HamanoApr 10, 2018
  11. fixup! [PATCH 2/6] doc: align 'diff --no-index' in text with synopsisAndreas Heiduk, Apr 11, 2018
  12. 1/6 doc: fix formatting inconsistency in githooks.txtAndreas Heiduk, Apr 10, 2018
  13. Martin ÅgrenApr 10, 2018
  14. Andreas HeidukApr 10, 2018
  15. Martin ÅgrenApr 10, 2018
  16. Junio C HamanoApr 10, 2018
  17. Andreas HeidukApr 11, 2018
  18. fixup! [PATCH 1/6] doc: fix formatting inconsistency in githooks.txtAndreas Heiduk, Apr 11, 2018
  19. fixup! [PATCH 1/6] doc: fix formatting inconsistency in githooks.txtAndreas Heiduk, Apr 11, 2018
  20. Martin ÅgrenApr 12, 2018
  21. Andreas HeidukApr 27, 2018
  22. 5/6 git-svn: commit-diff does not support --add-author-fromAndreas Heiduk, Apr 10, 2018
  23. Eric WongApr 17, 2018
  24. Andreas HeidukApr 27, 2018
  25. 6/6 doc: add note about shell quoting to revision.txtAndreas Heiduk, Apr 10, 2018
  26. Junio C HamanoApr 10, 2018
  27. 0/6 Some doc-fixesAndreas Heiduk, Apr 27, 2018
  28. 1/6 doc: improve formatting in githooks.txtAndreas Heiduk, Apr 27, 2018
  29. Martin ÅgrenApr 27, 2018
  30. 2/6 doc: align 'diff --no-index' in text with synopsisAndreas Heiduk, Apr 27, 2018
  31. Martin ÅgrenApr 27, 2018
  32. Andreas HeidukApr 27, 2018
  33. Martin ÅgrenApr 27, 2018
  34. Andreas HeidukApr 27, 2018
  35. Eric SunshineApr 27, 2018
  36. Andreas HeidukApr 27, 2018
  37. Martin ÅgrenApr 27, 2018
  38. Eric SunshineApr 27, 2018
  39. 4/6 doc: add '-d' and '-o' for 'git push'Andreas Heiduk, Apr 27, 2018
  40. 3/6 doc: clarify ignore rules for git ls-filesAndreas Heiduk, Apr 27, 2018
  41. 5/6 git-svn: remove ''--add-author-from' for 'commit-diff'Andreas Heiduk, Apr 27, 2018
  42. 6/6 doc: add note about shell quoting to revision.txtAndreas Heiduk, Apr 27, 2018
  43. Eric SunshineApr 27, 2018
  44. Andreas HeidukApr 27, 2018
  45. 0/7 Some doc-fixesAndreas Heiduk, May 3, 2018
  46. 1/7 doc: improve formatting in githooks.txtAndreas Heiduk, May 3, 2018
  47. 2/7 doc: align 'diff --no-index' in text and synopsisAndreas Heiduk, May 3, 2018
  48. 3/7 doc: clarify ignore rules for git ls-filesAndreas Heiduk, May 3, 2018
  49. 4/7 doc: add '-d' and '-o' for 'git push'Andreas Heiduk, May 3, 2018
  50. 5/7 git-svn: remove ''--add-author-from' for 'commit-diff'Andreas Heiduk, May 3, 2018
  51. 6/7 doc: add note about shell quoting to revision.txtAndreas Heiduk, May 3, 2018
  52. 7/7 doc: normalize [--options] to [options] in git-diffAndreas Heiduk, May 3, 2018
  53. Martin ÅgrenMay 4, 2018
  54. 7/6 doc: normalize [--options] to [options] in git-diffAndreas Heiduk, Apr 27, 2018

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.