diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-13 15:00:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-13 15:00:05 -0700 |
| commit | 92d80370646a0ce43b0c769027492b3c891090aa (patch) | |
| tree | cee7315334fee3145cb4badcc7a400e3e763fbac /diff-format.txt | |
| parent | 48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff) | |
| download | git-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz | |
Autogenerated HTML docs for v2.9.1-273-g79ed4
Diffstat (limited to 'diff-format.txt')
| -rw-r--r-- | diff-format.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/diff-format.txt b/diff-format.txt index 85b08909c..cf5262622 100644 --- a/diff-format.txt +++ b/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: |