Merge branch 'maint-1.7.8' into maint

By Thomas Rast * maint-1.7.8: Document the --histogram diff option
git-mirror · Mar 6, 2012 · 80a3f53 · 80a3f53
2 parents 69f4e08 + e521850
commit 80a3f53
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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[=<width>[,<name-width>[,<count>]]]::
 	Generate a diffstat.  You can override the default
 	output width for 80-column terminal by `--stat=<width>`.