summaryrefslogtreecommitdiff
path: root/Documentation/git-branch.txt
diff options
context:
space:
mode:
authorBrian Gernhardt <benji@silverinsanity.com>2007-01-03 15:36:29 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-03 16:16:02 (GMT)
commitf3673988ecb3d3174f9b6d3d04f00774b1b5c261 (patch)
treef3f27b39c98c6c4273da03fa8484afc700eb97d2 /Documentation/git-branch.txt
parent956259ee74df5695c55f51e9f93bbc217953a41a (diff)
downloadgit-f3673988ecb3d3174f9b6d3d04f00774b1b5c261.zip
git-f3673988ecb3d3174f9b6d3d04f00774b1b5c261.tar.gz
git-f3673988ecb3d3174f9b6d3d04f00774b1b5c261.tar.bz2
Add documentation for git-branch's color configuration.
Added color.branch and color.branch.<slot> to configuration list. Style copied from color.status and meanings derived from the code. Moved the color meanings from color.diff.<slot> to color.branch.<slot> since the latter comes first alphabetically. Added --color and --no-color to git-branch's usage and documentation. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-branch.txt')
-rw-r--r--Documentation/git-branch.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index c464bd2..e872fc8 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -8,7 +8,7 @@ git-branch - List, create, or delete branches.
SYNOPSIS
--------
[verse]
-'git-branch' [-r | -a] [-v [--abbrev=<length>]]
+'git-branch' [--color | --no-color] [-r | -a] [-v [--abbrev=<length>]]
'git-branch' [-l] [-f] <branchname> [<start-point>]
'git-branch' (-m | -M) [<oldbranch>] <newbranch>
'git-branch' (-d | -D) [-r] <branchname>...
@@ -60,6 +60,13 @@ OPTIONS
-M::
Move/rename a branch even if the new branchname already exists.
+--color::
+ Color branches to highlight current, local, and remote branches.
+
+--no-color::
+ Turn off branch colors, even when the configuration file gives the
+ default to color output.
+
-r::
List or delete (if used with -d) the remote-tracking branches.