diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-18 21:31:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-18 21:31:20 -0700 |
| commit | fab45027e0cdf3ebdade137cb3740604da7bb4bc (patch) | |
| tree | 32a7b9192c508b3a6e527246f1f842de6df889de | |
| parent | Merge git://git.kernel.org/pub/scm/gitk/gitk (diff) | |
| parent | Documentation: Describe other situations where -z affects git diff (diff) | |
| download | tgif-fab45027e0cdf3ebdade137cb3740604da7bb4bc.tar.xz | |
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 60e922e6ef..c9c6c2b1cb 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, |