]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 82b416e 8dbf3eb)
Merge branch 'jk/color-diff-plain-is-context'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 16:29:53 +0000 (09:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 16:29:53 +0000 (09:29 -0700)
commitdb65170ee5558b47355e7f9f111aecb5b152d4d9
tree475abf30cf47918b0e2d01b01ace04d20c498898tree | snapshot
parent82b416e063d9b1497eac78a8deaad340d251f1dccommit | diff
parent8dbf3eb6850d6d9495ace908625fe50888b111e6commit | diff
Merge branch 'jk/color-diff-plain-is-context'

"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
combine-diff.c diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
diff.h diff1 | diff2 | blob | history
line-log.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.