| commit | db65170ee5558b47355e7f9f111aecb5b152d4d9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 16:29:53 +0000 (11 09:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 16:29:53 +0000 (11 09:29 -0700) | ||
| tree | 475abf30cf47918b0e2d01b01ace04d20c498898 | treesnapshot (tar.gz zip) |
| parent | 82b416e063d9b1497eac78a8deaad340d251f1dc | commitdiff |
| parent | 8dbf3eb6850d6d9495ace908625fe50888b111e6 | commitdiff |
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"
"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 |
| combine-diff.c | diff1 | diff2 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |
| diff.h | diff1 | diff2 | blobhistory |
| line-log.c | diff1 | diff2 | blobhistory |