From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 3 Apr 2016 17:29:25 +0000 (-0700)
Subject: Merge branch 'jk/add-i-highlight'
X-Git-Tag: v2.9.0-rc0~174
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2052c52d9a16fe1d9a091dd0b53ab1806a663999?ds=inline;hp=-c

Merge branch 'jk/add-i-highlight'

* jk/add-i-highlight:
add--interactive: allow custom diff highlighting programs
---

2052c52d9a16fe1d9a091dd0b53ab1806a663999
diff --combined Documentation/config.txt
index 4b85095fc2,f5834ecc9e..aea6bd127d
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1113,9 -1113,8 +1113,9 @@@ commit.template:
  credential.helper::
  	Specify an external helper to be called when a username or
  	password credential is needed; the helper may consult external
 -	storage to avoid prompting the user for the credentials. See
 -	linkgit:gitcredentials[7] for details.
 +	storage to avoid prompting the user for the credentials. Note
 +	that multiple helpers may be defined. See linkgit:gitcredentials[7]
 +	for details.
  
  credential.useHttpPath::
  	When acquiring credentials, consider the "path" component of an http
@@@ -1887,6 -1886,14 +1887,14 @@@ interactive.singleKey:
  	setting is silently ignored if portable keystroke input
  	is not available; requires the Perl module Term::ReadKey.
  
+ interactive.diffFilter::
+ 	When an interactive command (such as `git add --patch`) shows
+ 	a colorized diff, git will pipe the diff through the shell
+ 	command defined by this configuration variable. The command may
+ 	mark up the diff further for human consumption, provided that it
+ 	retains a one-to-one correspondence with the lines in the
+ 	original diff. Defaults to disabled (no filtering).
+ 
  log.abbrevCommit::
  	If true, makes linkgit:git-log[1], linkgit:git-show[1], and
  	linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may