Autogenerated manpages for v1.5.2.1-271-g90ac

diff --git a/man1/git-blame.1 b/man1/git-blame.1
index fa4373c3696b2f2b8b9e2df97ad1369203c64f4e..731ce1e3baff80a430f47fa4261073aad327698a 100644 (file)
--- a/man1/git-blame.1
+++ b/man1/git-blame.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\-BLAME" "1" "06/08/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual"
+.TH "GIT\-BLAME" "1" "06/13/2007" "Git 1.5.2.1.271.g90ac" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -12,7 +12,7 @@ git\-blame \- Show what revision and author last modified each line of a file
 .SH "SYNOPSIS"
 .sp
 .nf
-\fIgit\-blame\fR [\-c] [\-b] [\-\-root] [\-s] [\-l] [\-t] [\-f] [\-n] [\-p] [\-\-incremental] [\-L n,m]
+\fIgit\-blame\fR [\-c] [\-b] [\-l] [\-\-root] [\-t] [\-f] [\-n] [\-s] [\-p] [\-w] [\-\-incremental] [\-L n,m]
             [\-S <revs\-file>] [\-M] [\-C] [\-C] [\-\-since=<date>]
             [<rev> | \-\-contents <file>] [\-\-] <file>
 .fi
@@ -116,6 +116,9 @@ Show line number in the original commit (Default: off).
 .TP
 \-s
 Suppress author name and timestamp from the output.
+.TP
+\-w
+Ignore whitespace when comparing parent's version and child's to find where the lines came from.
 .SH "THE PORCELAIN FORMAT"
 In this format, each line is output after a header; the header at the minimum has the first line which has:
 .TP 3

diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1
index 772f41568a28cf327909b09cdfb697516e1aa317..537ad41aa3f67bf1e887f6e3d2fbd68f32ff91a7 100644 (file)
--- a/man1/git-cvsimport.1
+++ b/man1/git-cvsimport.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\-CVSIMPORT" "1" "06/08/2007" "Git 1.5.2.1.144.gabc40" "Git Manual"
+.TH "GIT\-CVSIMPORT" "1" "06/13/2007" "Git 1.5.2.1.271.g90ac" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -16,14 +16,14 @@ git\-cvsimport \- Salvage your data out of another SCM people love to hate
               [\-A <author\-conv\-file>] [\-p <options\-for\-cvsps>] [\-P <file>]
               [\-C <git_repository>] [\-z <fuzz>] [\-i] [\-k] [\-u] [\-s <subst>]
               [\-a] [\-m] [\-M <regex>] [\-S <regex>] [\-L <commitlimit>]
-              [<CVS_module>]
+              [\-r <remote>] [<CVS_module>]
 .fi
 .SH "DESCRIPTION"
 Imports a CVS repository into git. It will either create a new repository, or incrementally import into an existing one.
 
 Splitting the CVS log into patch sets is done by \fIcvsps\fR. At least version 2.1 is required.
 
-You should \fBnever\fR do any work of your own on the branches that are created by git\-cvsimport. The initial import will create and populate a "master" branch from the CVS repository's main branch which you're free to work with; after that, you need to \fIgit merge\fR incremental imports, or any CVS branches, yourself.
+You should \fBnever\fR do any work of your own on the branches that are created by git\-cvsimport. By default initial import will create and populate a "master" branch from the CVS repository's main branch which you're free to work with; after that, you need to \fIgit merge\fR incremental imports, or any CVS branches, yourself. It is advisable to specify a named remote via \-r to separate and protect the incoming branches.
 .SH "OPTIONS"
 .TP
 \-v
@@ -38,8 +38,11 @@ The CVS module you want to import. Relative to <CVSROOT>. If not given, git\-cvs
 \-C <target\-dir>
 The git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory.
 .TP
+\-r <remote>
+The git remote to import this CVS repository into. Moves all CVS branches into remotes/<remote>/<branch> akin to the git\-clone \-\-use\-separate\-remote option.
+.TP
 \-o <branch\-for\-HEAD>
-The \fIHEAD\fR branch from CVS is imported to the \fIorigin\fR branch within the git repository, as \fIHEAD\fR already has a special meaning for git. Use this option if you want to import into a different branch.
+When no remote is specified (via \-r) the \fIHEAD\fR branch from CVS is imported to the \fIorigin\fR branch within the git repository, as \fIHEAD\fR already has a special meaning for git. When a remote is specified the \fIHEAD\fR branch is named remotes/<remote>/master mirroring git\-clone behaviour. Use this option if you want to import into a different branch.
 
 Use \fI\-o master\fR for continuing an import that was initially done by the old cvs2git tool.
 .TP