X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=ba7cd13483194399762b0f48e218ddb4011dfcf1;hb=8502a779dad784785d9f3d5c880ce08b9ad0f483;hp=66624a17698ac91cfcd6d45d1af6024c4bf066d9;hpb=901c907d83f523a5df0b10c0aafb19c512836624;p=git.git diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 66624a176..ba7cd1348 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -52,6 +52,9 @@ endif::git-format-patch[] --patience:: Generate a diff using the "patience diff" algorithm. +--histogram:: + Generate a diff using the "histogram diff" algorithm. + --stat[=[,[,]]]:: Generate a diffstat. You can override the default output width for 80-column terminal by `--stat=`. @@ -408,6 +411,10 @@ endif::git-format-patch[] Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. +-W:: +--function-context:: + Show whole surrounding functions of changes. + ifndef::git-format-patch[] ifndef::git-log[] --exit-code::