git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c5baf18 8dbf3eb)
Merge branch 'jk/color-diff-plain-is-context' into maint
authorJunio C Hamano <redacted>
Thu, 25 Jun 2015 18:02:11 +0000 (11:02 -0700)
committerJunio C Hamano <redacted>
Thu, 25 Jun 2015 18:02:11 +0000 (11:02 -0700)
commit6998d890c7120fe2d30fa0b6f80ddfaad716f632
tree8a17d03e86dfb10d072225c303a576fe32d8d4cdtree | snapshot
parentc5baf18a404a9713e1b75161855cacbfec32fcf2commit | diff
parent8dbf3eb6850d6d9495ace908625fe50888b111e6commit | diff
Merge branch 'jk/color-diff-plain-is-context' into maint

"color.diff.plain" was a misnomer; give it 'color.diff.context' as
a more logical synonym.

* jk/color-diff-plain-is-context:
  diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
  diff: accept color.diff.context as a synonym for "plain"
Documentation/config.txt diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
line-log.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT