From: Junio C Hamano Date: Fri, 22 Dec 2006 07:28:25 +0000 (+0000) Subject: Autogenerated man pages for v1.4.4.3-gfa39b X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95ffde0b9052aa43b717dc75a642fec85eae2467;p=git.git Autogenerated man pages for v1.4.4.3-gfa39b --- diff --git a/man1/git-branch.1 b/man1/git-branch.1 index 84bcda14b..9d9f9ad48 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/13/2006" "" "" +.TH "GIT\-BRANCH" "1" "12/22/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -15,7 +15,7 @@ git\-branch \- List, create, or delete branches. \fIgit\-branch\fR [\-r | \-a] [\-v [\-\-abbrev=]] \fIgit\-branch\fR [\-l] [\-f] [] \fIgit\-branch\fR (\-m | \-M) [] -\fIgit\-branch\fR (\-d | \-D) \&... +\fIgit\-branch\fR (\-d | \-D) [\-r] \&... .fi .SH "DESCRIPTION" With no arguments given a list of existing branches will be shown, the current branch will be highlighted with an asterisk. Option \-r causes the remote\-tracking branches to be listed, and option \-a shows both. @@ -24,7 +24,7 @@ In its second form, a new branch named will be created. It will sta With a \fI\-m\fR or \fI\-M\fR option, will be renamed to . If had a corresponding reflog, it is renamed to match , and a reflog entry is created to remember the branch renaming. If exists, \-M must be used to force the rename to happen. -With a \-d or \-D option, will be deleted. You may specify more than one branch for deletion. If the branch currently has a ref log then the ref log will also be deleted. +With a \-d or \-D option, will be deleted. You may specify more than one branch for deletion. If the branch currently has a ref log then the ref log will also be deleted. Use \-r together with \-d to delete remote\-tracking branches. .SH "OPTIONS" .TP \-d @@ -46,7 +46,7 @@ Move/rename a branch and the corresponding reflog. Move/rename a branch even if the new branchname already exists. .TP \-r -List the remote\-tracking branches. +List or delete (if used with \-d) the remote\-tracking branches. .TP \-a List both remote\-tracking branches and local branches. @@ -87,10 +87,13 @@ Delete unneeded branch .nf $ git clone git://git.kernel.org/.../git.git my.git $ cd my.git -$ git branch \-D todo \fB(1)\fR +$ git branch \-d \-r todo html man \fB(1)\fR +$ git branch \-D test \fB(2)\fR .fi .sp -\fB1. \fRdelete todo branch even if the "master" branch does not have all commits from todo branch. +\fB1. \fRdelete remote\-tracking branches "todo", "html", "man" +.br +\fB2. \fRdelete "test" branch even if the "master" branch does not have all commits from todo branch. .br .SH "NOTES" If you are creating a branch that you want to immediately checkout, it's easier to use the git checkout command with its \-b option to create a branch and check it out with a single command. diff --git a/man1/git-tag.1 b/man1/git-tag.1 index 0afea2c17..60d1941b8 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" "10/03/2006" "" "" +.TH "GIT\-TAG" "1" "12/22/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,24 +12,24 @@ git\-tag \- Create a tag object signed with GPG .SH "SYNOPSIS" .sp .nf -\fIgit\-tag\fR [\-a | \-s | \-u ] [\-f | \-d] [\-m ] [] +\fIgit\-tag\fR [\-a | \-s | \-u ] [\-f | \-d] [\-m | \-F ] + [] \fIgit\-tag\fR \-l [] .fi .SH "DESCRIPTION" Adds a \fItag\fR reference in .git/refs/tags/ -.sp + Unless \-f is given, the tag must not yet exist in .git/refs/tags/ directory. -.sp + If one of \-a, \-s, or \-u is passed, the command creates a \fItag\fR object, and requires the tag message. Unless \-m is given, an editor is started for the user to type in the tag message. -.sp + Otherwise just the SHA1 object name of the commit object is written (i.e. a lightweight tag). -.sp + A GnuPG signed tag object will be created when \-s or \-u is used. When \-u is not used, the committer identity for the current user is used to find the GnuPG key for signing. -.sp + \-d deletes the tag. -.sp + \-l lists tags that match the given pattern (or all if no pattern is given). -.sp .SH "OPTIONS" .TP \-a @@ -52,12 +52,13 @@ List tags that match the given pattern (or all if no pattern is given). .TP \-m Use the given tag message (instead of prompting) +.TP +\-F +Take the tag message from the given file. Use \fI\-\fR to read the message from the standard input. .SH "AUTHOR" Written by Linus Torvalds , Junio C Hamano and Chris Wright . -.sp .SH "DOCUMENTATION" Documentation by David Greaves, Junio C Hamano and the git\-list . -.sp .SH "GIT" Part of the \fBgit\fR(7) suite -.sp +