diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-30 13:50:27 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-30 13:50:27 +0900 |
| commit | 93e0b28dbb4c1a2cbdce1da8e229af075c2fa092 (patch) | |
| tree | a2c31aa765f27d752d2a20b1c94586202dcde8dc /Documentation/diff-options.txt | |
| parent | 5980e0d44258a6cccf1e5995947d4cba15145924 (diff) | |
| parent | 9364bf465d23ff26f5e2eb4ee52434e7a69894f1 (diff) | |
| download | git-93e0b28dbb4c1a2cbdce1da8e229af075c2fa092.tar.gz | |
Merge branch 'ab/pathname-encoding-doc'
Clarify that pathnames recorded in Git trees are most often (but
not necessarily) encoded in UTF-8.
* ab/pathname-encoding-doc:
doc: clarify the filename encoding in git diff
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 6d968b9012..530d115914 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -300,11 +300,14 @@ explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). --name-only:: - Show only names of changed files. + Show only names of changed files. 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 of the `--diff-filter` option on what the status letters mean. + Just like `--name-only` the file names are often encoded in UTF-8. --submodule[=<format>]:: Specify how differences in submodules are shown. When specifying |