Permalink
Browse files

Merge branch 'maint-1.7.7' into maint-1.7.8

By Thomas Rast
* maint-1.7.7:
  Document the --histogram diff option
  • Loading branch information...
2 parents c524ceb + d909e07 commit e521850bfd4aa79632c99293a39dad56bcaa4143 @gitster gitster committed Mar 6, 2012
Showing with 3 additions and 0 deletions.
  1. +3 −0 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>`.

0 comments on commit e521850

Please sign in to comment.