X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=f523ec2fbea9a129294b960461c82382b41ac92d;hb=1a82e79315ed633f6b0b1fc4076054950c5380d3;hp=2a0275eeda19b7af50e22f0709e6a31afee10b5e;hpb=bff606b8e9b897caeb66c4addfd16c04ebea0b8b;p=git.git diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 2a0275ee..f523ec2f 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -4,6 +4,19 @@ -u:: Synonym for "-p". +--patch-with-raw:: + Generate patch but keep also the default raw diff output. + +--stat:: + Generate a diffstat instead of a patch. + +--summary:: + Output a condensed summary of extended header information + such as creations, renames and mode changes. + +--patch-with-stat:: + Generate patch and prepend its diffstat. + -z:: \0 line termination on output @@ -69,6 +82,10 @@ changeset, not just the files that contain the change in . +--pickaxe-regex:: + Make the not a plain string but an extended POSIX + regex to match. + -O:: Output the patch in the order specified in the , which has one shell glob pattern per line.