Merge pull request #128 from elofu17/patch-2

For conformity, always color trailing whitespace green, not red or blue
This commit is contained in:
Anthony Scopatz 2016-12-06 20:24:25 -05:00 committed by GitHub
commit d2d84b8206
3 changed files with 3 additions and 3 deletions

View File

@ -46,7 +46,7 @@ color brightblack "^#[[:space:]]On branch"
color brightblack "#"
# Trailing spaces (+LINT is not ok, git uses tabs)
color ,red "[[:space:]]+$"
color ,green "[[:space:]]+$"
# This syntax format is used for interactive rebasing

View File

@ -21,4 +21,4 @@ icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
## Comments
color magenta "(^|;)[[:space:]]*#.*"
## Trailing whitespace
color ,blue "[[:space:]]+$"
color ,green "[[:space:]]+$"

View File

@ -39,4 +39,4 @@ color cyan "(^|[[:space:]])#.*$"
color brightcyan "(^|[[:space:]])##.*$"
## Trailing spaces
color ,blue "[[:space:]]+$"
color ,green "[[:space:]]+$"