summaryrefslogtreecommitdiff
path: root/graph.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-20 11:29:36 -0700
committerJunio C Hamano <gitster@pobox.com>2010-03-20 11:29:36 -0700
commitf1aa782a3b72a2c4de46dc93b484eb99dc01d4d0 (patch)
tree7f668cd8acbb2b897c71125d55ac64cac5a7b529 /graph.c
parentd7173d942ea897b67ac9ba3bab2a0cc374684ca6 (diff)
parent00588bb5cd4a7ff5e2b1ded97d4459bfe6aad6eb (diff)
downloadgit-f1aa782a3b72a2c4de46dc93b484eb99dc01d4d0.tar.gz
Merge branch 'ml/color-grep'
* ml/color-grep: grep: Colorize selected, context, and function lines grep: Colorize filename, line number, and separator Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
Diffstat (limited to 'graph.c')
-rw-r--r--graph.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/graph.c b/graph.c
index 6746d422a9..e6bbcaa8c4 100644
--- a/graph.c
+++ b/graph.c
@@ -80,12 +80,12 @@ static char column_colors[][COLOR_MAXLEN] = {
GIT_COLOR_BLUE,
GIT_COLOR_MAGENTA,
GIT_COLOR_CYAN,
- GIT_COLOR_BOLD GIT_COLOR_RED,
- GIT_COLOR_BOLD GIT_COLOR_GREEN,
- GIT_COLOR_BOLD GIT_COLOR_YELLOW,
- GIT_COLOR_BOLD GIT_COLOR_BLUE,
- GIT_COLOR_BOLD GIT_COLOR_MAGENTA,
- GIT_COLOR_BOLD GIT_COLOR_CYAN,
+ GIT_COLOR_BOLD_RED,
+ GIT_COLOR_BOLD_GREEN,
+ GIT_COLOR_BOLD_YELLOW,
+ GIT_COLOR_BOLD_BLUE,
+ GIT_COLOR_BOLD_MAGENTA,
+ GIT_COLOR_BOLD_CYAN,
};
#define COLUMN_COLORS_MAX (ARRAY_SIZE(column_colors))