diff options
| author | Björn Gustavsson <bgustavsson@gmail.com> | 2009-11-23 07:40:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-23 09:21:51 (GMT) |
| commit | 5c931c8da2db4a8e0b5713e97cce474b6596e2ff (patch) | |
| tree | f2b766e3dfe4f0dd17398d704287c4125b97c321 /Documentation/diff-options.txt | |
| parent | c34ec65567793d16119c28df6ebeecfe8eb3d9f5 (diff) | |
| download | git-5c931c8da2db4a8e0b5713e97cce474b6596e2ff.zip git-5c931c8da2db4a8e0b5713e97cce474b6596e2ff.tar.gz git-5c931c8da2db4a8e0b5713e97cce474b6596e2ff.tar.bz2 | |
Fix over-simplified documentation for 'git log -z'
In commit 64485b4a, the documentation for 'git log -z' was
simplified too much. The -z option actually changes the behavior
of 'git log' in two ways: commits will be ended with a NUL
instead of a LF (correctly documented) and the --raw and
--numstat will have NUL as field terminators (omitted in
the documentation for 'git log').
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 18366b1..8707d0e 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -87,19 +87,21 @@ endif::git-format-patch[] ifndef::git-format-patch[] -z:: +ifdef::git-log[] + Separate the commits with NULs instead of with new newlines. ++ +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. +endif::git-log[] + Without this option, each pathname output will have TAB, LF, double quotes, and backslash characters replaced with `\t`, `\n`, `\"`, and `\\`, respectively, and the pathname will be enclosed in double quotes if any of those replacements occurred. -endif::git-log[] - -ifdef::git-log[] - Separate the commits with NULs instead of with new newlines. -endif::git-log[] --name-only:: Show only names of changed files. |