diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-05-26 15:55:31 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-29 14:51:29 +0900 |
| commit | 09c4ba410b0fda5a82dc5a9b71bfd4967927e6ca (patch) | |
| tree | da9fcb1a6f54ff0938e4a437aa8f195ac44782ee | |
| parent | bea2125928f4d6ddad34c6e651d4a9ec7ee5dd4e (diff) | |
| download | git-09c4ba410b0fda5a82dc5a9b71bfd4967927e6ca.tar.xz | |
log-tree: allow to customize 'grafted' color
Commit 76f5df305b (log: decorate grafted commits with "grafted" -
2011-08-18) lets us decorate grafted commits but I forgot about the
color.decorate.* config.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 3 | ||||
| -rw-r--r-- | log-tree.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index a6cd53b59c..4bb1b6f9af 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1162,7 +1162,8 @@ color.diff.<slot>:: color.decorate.<slot>:: Use customized color for 'git log --decorate' output. `<slot>` is one of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local - branches, remote-tracking branches, tags, stash and HEAD, respectively. + branches, remote-tracking branches, tags, stash and HEAD, respectively + and `grafted` for grafted commits. color.grep:: When set to `always`, always highlight matches. When `false` (or diff --git a/log-tree.c b/log-tree.c index 30706fe926..888c236aa3 100644 --- a/log-tree.c +++ b/log-tree.c @@ -34,6 +34,7 @@ static const char *color_decorate_slots[] = { [DECORATION_REF_TAG] = "tag", [DECORATION_REF_STASH] = "stash", [DECORATION_REF_HEAD] = "HEAD", + [DECORATION_GRAFTED] = "grafted", }; static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix) |