X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-generate-patch.txt;h=517e1eba3c56907ebcb1d478dceb184e53fceda4;hb=42fc11c1103a88c49233f04dc0c2f5659b3973fe;hp=029c5f2b82c5bece3fa4a9e6e87b83c517e0c7f6;hpb=887ad79865d862a0a3aef4b59957d7dd95d0507d;p=git.git diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index 029c5f2b8..517e1eba3 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -96,7 +96,7 @@ index fabadb8,cc95eb0..4866510 + or like this (when '--cc' option is used): - diff --c file + diff --cc file 2. It is followed by one or more extended header lines (this example shows a merge with two parents):