Merge branch 'tr/cache-tree' into maint-1.7.8

[git.git] / Documentation / diff-options.txt

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 66624a17698ac91cfcd6d45d1af6024c4bf066d9..ba7cd13483194399762b0f48e218ddb4011dfcf1 100644 (file)
--- 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.
 
 --patience::
        Generate a diff using the "patience diff" algorithm.
 

+--histogram::
+       Generate a diff using the "histogram diff" algorithm.
+

 --stat[=<width>[,<name-width>[,<count>]]]::
        Generate a diffstat.  You can override the default
        output width for 80-column terminal by `--stat=<width>`.
 --stat[=<width>[,<name-width>[,<count>]]]::
        Generate a diffstat.  You can override the default
        output width for 80-column terminal by `--stat=<width>`.


@@ -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.
 
        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::
 ifndef::git-format-patch[]
 ifndef::git-log[]
 --exit-code::