From: Junio C Hamano Date: Tue, 24 Apr 2007 07:34:36 +0000 (+0000) Subject: Autogenerated manpages for v1.5.2-rc0-14-g520d X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=475f8498f4def729fc2c90ba86b888a316025de5;p=git.git Autogenerated manpages for v1.5.2-rc0-14-g520d --- diff --git a/man1/git-checkout.1 b/man1/git-checkout.1 index c43119c03..46f55827a 100644 --- a/man1/git-checkout.1 +++ b/man1/git-checkout.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\-CHECKOUT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual" +.TH "GIT\-CHECKOUT" "1" "04/24/2007" "Git 1.5.2.rc0.14.g520d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,7 +12,7 @@ git\-checkout \- Checkout and switch to a branch .SH "SYNOPSIS" .sp .nf -\fIgit\-checkout\fR [\-q] [\-f] [\-b [\-\-track | \-\-no\-track] [\-l]] [\-m] [] +\fIgit\-checkout\fR [\-q] [\-f] [[\-\-track | \-\-no\-track] \-b [\-l]] [\-m] [] \fIgit\-checkout\fR [] \&... .fi .SH "DESCRIPTION" diff --git a/man1/git-clean.1 b/man1/git-clean.1 index 239cc50b0..0d0073bf2 100644 --- a/man1/git-clean.1 +++ b/man1/git-clean.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\-CLEAN" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual" +.TH "GIT\-CLEAN" "1" "04/24/2007" "Git 1.5.2.rc0.14.g520d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,7 +12,7 @@ git\-clean \- Remove untracked files from the working tree .SH "SYNOPSIS" .sp .nf -\fIgit\-clean\fR [\-d] [\-n] [\-q] [\-x | \-X] [\-\-] \&... +\fIgit\-clean\fR [\-d] [\-f] [\-n] [\-q] [\-x | \-X] [\-\-] \&... .fi .SH "DESCRIPTION" Removes files unknown to git. This allows to clean the working tree from files that are not under version control. If the \fI\-x\fR option is specified, ignored files are also removed, allowing to remove all build products. When optional \&... arguments are given, the paths affected are further limited to those that match them. @@ -21,6 +21,9 @@ Removes files unknown to git. This allows to clean the working tree from files t \-d Remove untracked directories in addition to untracked files. .TP +\-f +If the git configuration specifies clean.forceRequire as true, git\-clean will refuse to run unless given \-f or \-n. +.TP \-n Don't actually remove anything, just show what would be done. .TP diff --git a/man1/git-config.1 b/man1/git-config.1 index 493986674..8cd3e8e2c 100644 --- a/man1/git-config.1 +++ b/man1/git-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\-CONFIG" "1" "04/22/2007" "Git 1.5.1.2.240.g42c4" "Git Manual" +.TH "GIT\-CONFIG" "1" "04/24/2007" "Git 1.5.2.rc0.14.g520d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -346,6 +346,9 @@ 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. If you wish to setup git pull so that it merges into from another branch in the local repository, you can point branch..merge to the desired branch, and use the special setting . (a period) for branch..remote. .TP +clean.requireForce +A boolean to make git\-clean do nothing unless given \-f or \-n. Defaults to false. +.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 diff --git a/man1/git-reset.1 b/man1/git-reset.1 index faca9f188..c4730cee9 100644 --- a/man1/git-reset.1 +++ b/man1/git-reset.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\-RESET" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual" +.TH "GIT\-RESET" "1" "04/24/2007" "Git 1.5.2.rc0.14.g520d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -52,6 +52,8 @@ $ git commit \-a \-c ORIG_HEAD \fB(3)\fR \fB2. \fRmake corrections to working tree files. .br \fB3. \fR"reset" copies the old head to .git/ORIG_HEAD; redo the commit by starting with its log message. If you do not need to edit the message further, you can give \-C option instead. + +See also the \-\-amend option to \fBgit\-commit\fR(1). .br .TP Undo commits permanently