X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Documentation%2Fdiff-format.txt;h=cf5262622f6a7f82b3989cbcb4ee1ebd4652b220;hb=bcf9626a71a0d90be65acc265ad0ec488d95d6ed;hp=f10fd549b48af512551244ec98b4032b8d212488;hpb=23f8239bbe0a893bd8754a03e9d4fda62804ac14;p=thirdparty%2Fgit.git diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index f10fd549b4..cf5262622f 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -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: