Merge branch 'maint-1.7.7' into maint-1.7.8

By Thomas Rast
* maint-1.7.7:
Document the --histogram diff option

diff --combined Documentation/diff-options.txt
index 9f7cba2be6a97cb85072d22b3317d37d1afe80bf,de2206bd5ccf936e97cfde5def4388cb3439300c..ba7cd13483194399762b0f48e218ddb4011dfcf1
--- 1/Documentation/diff-options.txt
--- 2/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -52,6 -52,9 +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[=<width>[,<name-width>[,<count>]]]::
        Generate a diffstat.  You can override the default
        output width for 80-column terminal by `--stat=<width>`.
@@@ -408,10 -411,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::