From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Jan 2009 08:10:14 +0000 (-0800)
Subject: Merge branch 'rs/diff-ihc'
X-Git-Tag: v1.6.2-rc0~183
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7bb5321be0ecb70a990ad49da2a1366c19201372;p=git.git

Merge branch 'rs/diff-ihc'

* rs/diff-ihc:
  diff: add option to show context between close hunks

Conflicts:
	Documentation/diff-options.txt
---

7bb5321be0ecb70a990ad49da2a1366c19201372
diff --cc Documentation/diff-options.txt
index b432d2518,c7fcc8007..671f533ca
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -205,6 -212,13 +205,10 @@@ endif::git-format-patch[
  	differences even if one line has whitespace where the other
  	line has none.
  
 --w::
 -	Shorthand for "--ignore-all-space".
 -
+ --inter-hunk-context=<lines>::
+ 	Show the context between diff hunks, up to the specified number
+ 	of lines, thereby fusing hunks that are close to each other.
+ 
  --exit-code::
  	Make the program exit with codes similar to diff(1).
  	That is, it exits with 1 if there were differences and