diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-28 11:25:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-28 11:25:54 -0700 |
| commit | 1032eb9c2aa34b4a908fb9d2d1cfe9680e0c34ce (patch) | |
| tree | 10bf06936fb9e52fccc4fd2cf929d5fd7eb421a1 /Documentation/diff-format.txt | |
| parent | Merge branch 'js/sign-empty-commit-fix' into maint (diff) | |
| parent | doc: typeset HEAD and variants as literal (diff) | |
| download | tgif-1032eb9c2aa34b4a908fb9d2d1cfe9680e0c34ce.tar.xz | |
Merge branch 'mm/doc-tt' into maint
More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.
* mm/doc-tt:
doc: typeset HEAD and variants as literal
CodingGuidelines: formatting HEAD in documentation
doc: typeset long options with argument as literal
doc: typeset '--' as literal
doc: typeset long command-line options as literal
doc: typeset short command-line options as literal
Documentation/git-mv.txt: fix whitespace indentation
Diffstat (limited to 'Documentation/diff-format.txt')
| -rw-r--r-- | Documentation/diff-format.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 85b08909ce..cf5262622f 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -46,11 +46,11 @@ That is, from the left to the right: . sha1 for "dst"; 0\{40\} if creation, unmerged or "look at work tree". . a space. . status, followed by optional "score" number. -. a tab or a NUL when '-z' option is used. +. a tab or a NUL when `-z` option is used. . path for "src" -. a tab or a NUL when '-z' option is used; only exists for C or R. +. a tab or a NUL when `-z` option is used; only exists for C or R. . path for "dst"; only exists for C or R. -. an LF or a NUL when '-z' option is used, to terminate the record. +. an LF or a NUL when `-z` option is used, to terminate the record. Possible status letters are: @@ -86,7 +86,7 @@ diff format for merges ---------------------- "git-diff-tree", "git-diff-files" and "git-diff --raw" -can take '-c' or '--cc' option +can take `-c` or `--cc` option to generate diff output also for merge commits. The output differs from the format described above in the following way: |