Merge branch 'fc/branch-upstream-color'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 21d4447cb4fe38037da6d0406edd7a56890c9745..29559c88af2e5cc2aeffdc29626b6710446bc10f 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -807,7 +807,8 @@ color.branch::
 color.branch.<slot>::
        Use customized color for branch coloration. `<slot>` is one of
        `current` (the current branch), `local` (a local branch),
-       `remote` (a remote-tracking branch in refs/remotes/), `plain` (other
+       `remote` (a remote-tracking branch in refs/remotes/),
+       `upstream` (upstream tracking branch), `plain` (other
        refs).
 +
 The value for these configuration variables is a list of colors (at most