diff options
| author | Brian Gernhardt <benji@silverinsanity.com> | 2007-01-03 10:36:29 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-03 08:16:02 -0800 |
| commit | f3673988ecb3d3174f9b6d3d04f00774b1b5c261 (patch) | |
| tree | f3f27b39c98c6c4273da03fa8484afc700eb97d2 /builtin-branch.c | |
| parent | 956259ee74df5695c55f51e9f93bbc217953a41a (diff) | |
| download | git-f3673988ecb3d3174f9b6d3d04f00774b1b5c261.tar.gz git-f3673988ecb3d3174f9b6d3d04f00774b1b5c261.tar.xz | |
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 'builtin-branch.c')
| -rw-r--r-- | builtin-branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index 745ee04d6..1ed0fa906 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -12,7 +12,7 @@ #include "builtin.h" static const char builtin_branch_usage[] = - "git-branch [-r] (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>] | (-m | -M) [<oldbranch>] <newbranch> | [-r | -a] [-v [--abbrev=<length>]]"; + "git-branch [-r] (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>] | (-m | -M) [<oldbranch>] <newbranch> | [--color | --no-color] [-r | -a] [-v [--abbrev=<length>]]"; #define REF_UNKNOWN_TYPE 0x00 #define REF_LOCAL_BRANCH 0x01 |