diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-19 20:31:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-19 20:31:24 (GMT) |
| commit | 4059da335240ab35da6ee9d6f73346eba28fdfc7 (patch) | |
| tree | c50b160c3534f34ba256cad22af751395e65861a /Documentation | |
| parent | 574d51b575d9025d57c610c3b571ca58d347d0da (diff) | |
| parent | dbda21fa87c1c5495c2f8ced4c40d7dbfa1cdcc2 (diff) | |
| download | git-4059da335240ab35da6ee9d6f73346eba28fdfc7.zip git-4059da335240ab35da6ee9d6f73346eba28fdfc7.tar.gz git-4059da335240ab35da6ee9d6f73346eba28fdfc7.tar.bz2 | |
Merge branch 'fc/branch-upstream-color'
Add more colors to "git branch -vv" output.
* fc/branch-upstream-color:
branch: colour upstream branches
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 21d4447..29559c8 100644 --- 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 |