| commit | 6998d890c7120fe2d30fa0b6f80ddfaad716f632 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Jun 2015 18:02:11 +0000 (25 11:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Jun 2015 18:02:11 +0000 (25 11:02 -0700) | ||
| tree | 8a17d03e86dfb10d072225c303a576fe32d8d4cd | treesnapshot (tar.gz zip) |
| parent | c5baf18a404a9713e1b75161855cacbfec32fcf2 | commitdiff |
| parent | 8dbf3eb6850d6d9495ace908625fe50888b111e6 | commitdiff |
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"
"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 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |
| line-log.c | diff1 | diff2 | blobhistory |