From ae8425dc7f1cba2bf5245d33f148f4aa9af177e1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 3 Jan 2007 22:02:23 +0000 Subject: [PATCH] Autogenerated man pages for v1.5.0-rc0-gd222 --- man1/git-branch.1 | 10 ++++++++-- man1/git-repo-config.1 | 12 +++++++++--- man1/git-tag.1 | 9 +++++++-- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/man1/git-branch.1 b/man1/git-branch.1 index 9d9f9ad48..d9f399069 100644 --- a/man1/git-branch.1 +++ b/man1/git-branch.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-BRANCH" "1" "12/22/2006" "" "" +.TH "GIT\-BRANCH" "1" "01/03/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,7 +12,7 @@ git\-branch \- List, create, or delete branches. .SH "SYNOPSIS" .sp .nf -\fIgit\-branch\fR [\-r | \-a] [\-v [\-\-abbrev=]] +\fIgit\-branch\fR [\-\-color | \-\-no\-color] [\-r | \-a] [\-v [\-\-abbrev=]] \fIgit\-branch\fR [\-l] [\-f] [] \fIgit\-branch\fR (\-m | \-M) [] \fIgit\-branch\fR (\-d | \-D) [\-r] \&... @@ -45,6 +45,12 @@ Move/rename a branch and the corresponding reflog. \-M Move/rename a branch even if the new branchname already exists. .TP +\-\-color +Color branches to highlight current, local, and remote branches. +.TP +\-\-no\-color +Turn off branch colors, even when the configuration file gives the default to color output. +.TP \-r List or delete (if used with \-d) the remote\-tracking branches. .TP diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1 index 0a655cd67..0f2edab05 100644 --- a/man1/git-repo-config.1 +++ b/man1/git-repo-config.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-REPO\-CONFIG" "1" "12/31/2006" "" "" +.TH "GIT\-REPO\-CONFIG" "1" "01/03/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -259,11 +259,17 @@ When in branch , it tells git fetch which remote to fetch. If this option branch..merge When in branch , it tells git fetch the default refspec to be marked for merging in FETCH_HEAD. The value has exactly to match a remote part of one of the refspecs which are fetched from the remote given by "branch..remote". The merge information is used by git pull (which at first calls git fetch) to lookup the default branch for merging. Without this option, git pull defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. .TP +color.branch +A boolean to enable/disable color in the output of \fBgit\-branch\fR(1). May be set to true (or always), false (or never) or auto, in which case colors are used only when the output is to a terminal. Defaults to false. +.TP +color.branch. +Use customized color for branch coloration. is one of current (the current branch), local (a local branch), remote (a tracking branch in refs/remotes/), plain (other refs), or reset (the normal terminal color). The value for these configuration variables can be one of: normal, bold, dim, ul, blink, reverse, reset, black, red, green, yellow, blue, magenta, cyan, or white. +.TP color.diff When true (or always), always use colors in patch. When false (or never), never. When set to auto, use colors only when the output is to the terminal. .TP color.diff. -Use customized color for diff colorization. specifies which part of the patch to use the specified color, and is one of plain (context text), meta (metainformation), frag (hunk header), old (removed lines), or new (added lines). The value for these configuration variables can be one of: normal, bold, dim, ul, blink, reverse, reset, black, red, green, yellow, blue, magenta, cyan, or white. +Use customized color for diff colorization. specifies which part of the patch to use the specified color, and is one of plain (context text), meta (metainformation), frag (hunk header), old (removed lines), or new (added lines). The values of these variables may be specified as in color.branch.. .TP color.pager A boolean to enable/disable colored output when the pager is in use (default is true). @@ -272,7 +278,7 @@ color.status A boolean to enable/disable color in the output of \fBgit\-status\fR(1). May be set to true (or always), false (or never) or auto, in which case colors are used only when the output is to a terminal. Defaults to false. .TP color.status. -Use customized color for status colorization. is one of header (the header text of the status message), added or updated (files which are added but not committed), changed (files which are changed but not added in the index), or untracked (files which are not tracked by git). The values of these variables may be specified as in color.diff.. +Use customized color for status colorization. is one of header (the header text of the status message), added or updated (files which are added but not committed), changed (files which are changed but not added in the index), or untracked (files which are not tracked by git). The values of these variables may be specified as in color.branch.. .TP diff.renameLimit The number of files to consider when performing the copy/rename detection; equivalent to the git diff option \fI\-l\fR. diff --git a/man1/git-tag.1 b/man1/git-tag.1 index 60d1941b8..d38383167 100644 --- a/man1/git-tag.1 +++ b/man1/git-tag.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-TAG" "1" "12/22/2006" "" "" +.TH "GIT\-TAG" "1" "01/03/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,7 +12,7 @@ git\-tag \- Create a tag object signed with GPG .SH "SYNOPSIS" .sp .nf -\fIgit\-tag\fR [\-a | \-s | \-u ] [\-f | \-d] [\-m | \-F ] +\fIgit\-tag\fR [\-a | \-s | \-u ] [\-f | \-d | \-v] [\-m | \-F ] [] \fIgit\-tag\fR \-l [] .fi @@ -29,6 +29,8 @@ A GnuPG signed tag object will be created when \-s or \-u is used. Whe \-d deletes the tag. +\-v verifies the gpg signature of the tag. + \-l lists tags that match the given pattern (or all if no pattern is given). .SH "OPTIONS" .TP @@ -47,6 +49,9 @@ Replace an existing tag with the given name (instead of failing) \-d Delete an existing tag with the given name .TP +\-v +Verify the gpg signature of given the tag +.TP \-l List tags that match the given pattern (or all if no pattern is given). .TP -- 2.26.2