Merge branch 'master' of git://repo.or.cz/git-gui into maint

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index c464bd2fda2e4828d2e5a36ca05b4c66ad592f7c..aa1fdd402aa1771ab77af5e274a7e0452bbe8aa5 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -3,12 +3,12 @@ git-branch(1)
 
 NAME
 ----
-git-branch - List, create, or delete branches.
+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.
 
@@ -67,7 +74,7 @@ OPTIONS
        List both remote-tracking branches and local branches.
 
 -v::
-       Show sha1 and commit subjectline for each head.
+       Show sha1 and commit subject line for each head.
 
 --abbrev=<length>::
        Alter minimum display length for sha1 in output listing,