]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b68962 0114384)
Merge branch 'jk/add-i-highlight'
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:25 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:25 +0000 (10:29 -0700)
* jk/add-i-highlight:
  add--interactive: allow custom diff highlighting programs

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/config.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.