| commit | 2052c52d9a16fe1d9a091dd0b53ab1806a663999 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 3 Apr 2016 17:29:25 +0000 (3 10:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 3 Apr 2016 17:29:25 +0000 (3 10:29 -0700) | ||
| tree | c7f1424fe121d7c3de94ebfd0b70519dd4bbce60 | treesnapshot (tar.gz zip) |
| parent | 1b68962b29e39b0455e0f15d6b95edc65accb98c | commitdiff |
| parent | 01143847dbf4fbf27268650f3ace16eac03b3130 | commitdiff |
Merge branch 'jk/add-i-highlight'
* jk/add-i-highlight:
add--interactive: allow custom diff highlighting programs
* jk/add-i-highlight:
add--interactive: allow custom diff highlighting programs
| Documentation/config.txt | diff1 | diff2 | blobhistory |