X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=9f7cba2be6a97cb85072d22b3317d37d1afe80bf;hb=bc2fed496baa54ae99dede7da23dec938adbf0eb;hp=5c53bdba948ea817e01e169a9fc183d4fc2d1313;hpb=dddc411f7abbd82f6fa7d323711b8a7b94a1abc2;p=git.git diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 5c53bdba9..9f7cba2be 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -408,7 +408,12 @@ 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:: Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and @@ -416,6 +421,7 @@ ifndef::git-format-patch[] --quiet:: Disable all output of the program. Implies `--exit-code`. +endif::git-log[] endif::git-format-patch[] --ext-diff::