summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-06 20:04:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-06 20:04:48 (GMT)
commite521850bfd4aa79632c99293a39dad56bcaa4143 (patch)
treeaf47d2597fe7f7ae2ae93899702ab908b6362eed
parentc524ceb12f65e2ad4fc68c9d5b39f6e4b6b5c17b (diff)
parentd909e0761c234b28aac77566368c1ee5451a856a (diff)
downloadgit-e521850bfd4aa79632c99293a39dad56bcaa4143.zip
git-e521850bfd4aa79632c99293a39dad56bcaa4143.tar.gz
git-e521850bfd4aa79632c99293a39dad56bcaa4143.tar.bz2
Merge branch 'maint-1.7.7' into maint-1.7.8
By Thomas Rast * maint-1.7.7: Document the --histogram diff option
-rw-r--r--Documentation/diff-options.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 9f7cba2..ba7cd13 100644
--- 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>`.