Merge branch 'jk/color-diff-plain-is-context' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 18:02:11 +0000 (11:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 18:02:11 +0000 (11:02 -0700)
commit6998d89...c7120fe2d30fa0b6f80ddfaad716f632
tree8a17d03...86dfb10d072225c303a576fe32d8d4cdcopy hash to clipboard (tree)
parentc5baf18...404a9713e1b75161855cacbfec32fcf2copy hash to clipboard (diff)
parent8dbf3eb...850d6d9495ace908625fe50888b111e6copy hash to clipboard (diff)
Documentation/config.txt
diff.c
line-log.c