Merge branch 'jc/addi-color'

* jc/addi-color:
config --get-colorbool: diff.color is a deprecated synonym to color.diff
Color support for "git-add -i"
git config --get-colorbool