summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-06 20:05:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-06 20:05:09 (GMT)
commit80a3f53424b2e3d6d7b9463dbd3faa888ced947f (patch)
treed2d4e63776f66affdd7e5509098c1966209f42c9
parent69f4e08f535d4e5a035069a64d1ebaea7be55d83 (diff)
parente521850bfd4aa79632c99293a39dad56bcaa4143 (diff)
downloadgit-80a3f53424b2e3d6d7b9463dbd3faa888ced947f.zip
git-80a3f53424b2e3d6d7b9463dbd3faa888ced947f.tar.gz
git-80a3f53424b2e3d6d7b9463dbd3faa888ced947f.tar.bz2
Merge branch 'maint-1.7.8' into maint
By Thomas Rast * maint-1.7.8: 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>`.