diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-19 04:31:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-19 04:31:20 (GMT) |
| commit | fab45027e0cdf3ebdade137cb3740604da7bb4bc (patch) | |
| tree | 32a7b9192c508b3a6e527246f1f842de6df889de | |
| parent | e8a12280530f16bf2089999ceefe35794d115d07 (diff) | |
| parent | 03aa87ed9912a6beac1a23e69ef0b70e1589d3d0 (diff) | |
| download | git-fab45027e0cdf3ebdade137cb3740604da7bb4bc.zip git-fab45027e0cdf3ebdade137cb3740604da7bb4bc.tar.gz git-fab45027e0cdf3ebdade137cb3740604da7bb4bc.tar.bz2 | |
Merge branch 'maint'
* maint:
Documentation: Describe other situations where -z affects git diff
| -rw-r--r-- | Documentation/diff-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 60e922e..c9c6c2b 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -94,8 +94,8 @@ Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators. endif::git-log[] ifndef::git-log[] - When `--raw` or `--numstat` has been given, do not munge - pathnames and use NULs as output field terminators. + When `--raw`, `--numstat`, `--name-only` or `--name-status` has been + given, do not munge pathnames and use NULs as output field terminators. endif::git-log[] + Without this option, each pathname output will have TAB, LF, double quotes, |