From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Mar 2012 20:04:48 +0000 (-0800)
Subject: Merge branch 'maint-1.7.7' into maint-1.7.8
X-Git-Tag: v1.7.9.4~6^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e521850bfd4aa79632c99293a39dad56bcaa4143?ds=inline;hp=-c

Merge branch 'maint-1.7.7' into maint-1.7.8

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

e521850bfd4aa79632c99293a39dad56bcaa4143
diff --combined Documentation/diff-options.txt
index 9f7cba2be6,de2206bd5c..ba7cd13483
--- a/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::