diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-03 17:29:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-03 17:29:25 (GMT) |
| commit | 2052c52d9a16fe1d9a091dd0b53ab1806a663999 (patch) | |
| tree | c7f1424fe121d7c3de94ebfd0b70519dd4bbce60 /Documentation | |
| parent | 1b68962b29e39b0455e0f15d6b95edc65accb98c (diff) | |
| parent | 01143847dbf4fbf27268650f3ace16eac03b3130 (diff) | |
| download | git-2052c52d9a16fe1d9a091dd0b53ab1806a663999.zip git-2052c52d9a16fe1d9a091dd0b53ab1806a663999.tar.gz git-2052c52d9a16fe1d9a091dd0b53ab1806a663999.tar.bz2 | |
Merge branch 'jk/add-i-highlight'
* jk/add-i-highlight:
add--interactive: allow custom diff highlighting programs
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 4b85095..aea6bd1 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1887,6 +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 |