summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-05-28 11:17:08 -0700
committerJunio C Hamano <gitster@pobox.com>2024-05-28 11:17:08 -0700
commit6e95dce712f1ec7cda64faf9348ff2daf903f538 (patch)
treed54bc7ae0e6f2c10604b864834f254c7ba4e06b6
parentee8537ebc9442ea94329125ae693750152ea090c (diff)
parent4986662cbc2c366d1db9207ff53dfc0d01f8b4dd (diff)
Merge branch 'jc/doc-diff-name-only'
The documentation for "git diff --name-only" has been clarified that it is about showing the names in the post-image tree. * jc/doc-diff-name-only: diff: document what --name-only shows
-rw-r--r--Documentation/diff-options.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 0e9456957e..c7df20e571 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -329,12 +329,13 @@ explained for the configuration variable `core.quotePath` (see
linkgit:git-config[1]).
--name-only::
- Show only names of changed files. The file names are often encoded in UTF-8.
+ Show only the name of each changed file in the post-image tree.
+ The file names are often encoded in UTF-8.
For more information see the discussion about encoding in the linkgit:git-log[1]
manual page.
--name-status::
- Show only names and status of changed files. See the description
+ Show only the name(s) and status of each changed file. See the description
of the `--diff-filter` option on what the status letters mean.
Just like `--name-only` the file names are often encoded in UTF-8.