From: Junio C Hamano Date: Wed, 13 Jun 2007 08:29:33 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.2.1-271-g90ac X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9e52d4ea667a8100ea390c15adae60a56a410699;p=git.git Autogenerated HTML docs for v1.5.2.1-271-g90ac --- diff --git a/git-blame.html b/git-blame.html index e2bc335ab..556ca7399 100644 --- a/git-blame.html +++ b/git-blame.html @@ -273,7 +273,7 @@ git-blame(1) Manual Page

SYNOPSIS

-
git-blame [-c] [-b] [--root] [-s] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] +
git-blame [-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>
@@ -510,6 +510,15 @@ commit. Suppress author name and timestamp from the output.

+
+-w +
+
+

+ Ignore whitespace when comparing parent's version and + child's to find where the lines came from. +

+

THE PORCELAIN FORMAT

@@ -683,7 +692,7 @@ commit commentary), a blame viewer won't ever care. diff --git a/git-blame.txt b/git-blame.txt index 44678b0c3..66f120370 100644 --- a/git-blame.txt +++ b/git-blame.txt @@ -8,7 +8,7 @@ git-blame - Show what revision and author last modified each line of a file SYNOPSIS -------- [verse] -'git-blame' [-c] [-b] [--root] [-s] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] +'git-blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m] [-S ] [-M] [-C] [-C] [--since=] [ | --contents ] [--] @@ -63,6 +63,11 @@ include::blame-options.txt[] -s:: Suppress author name and timestamp from the output. +-w:: + Ignore whitespace when comparing parent's version and + child's to find where the lines came from. + + THE PORCELAIN FORMAT -------------------- diff --git a/git-cvsimport.html b/git-cvsimport.html index 61d7daeb9..0ab2f4fe1 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -277,7 +277,7 @@ git-cvsimport(1) Manual Page [-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>]

DESCRIPTION

@@ -286,10 +286,11 @@ repository, or incrementally import into an existing one.

Splitting the CVS log into patch sets is done by cvsps. At least version 2.1 is required.

You should never do any work of your own on the branches that are -created by git-cvsimport. The initial import will create and populate a +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 git merge incremental imports, or -any CVS branches, yourself.

+any CVS branches, yourself. It is advisable to specify a named remote via +-r to separate and protect the incoming branches.

OPTIONS

@@ -334,13 +335,27 @@ any CVS branches, yourself.

+-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. +

+
+
-o <branch-for-HEAD>

- The HEAD branch from CVS is imported to the origin branch within - the git repository, as HEAD 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 HEAD branch + from CVS is imported to the origin branch within the git + repository, as HEAD already has a special meaning for git. + When a remote is specified the HEAD branch is named + remotes/<remote>/master mirroring git-clone behaviour. + Use this option if you want to import into a different + branch.

Use -o master for continuing an import that was initially done by the old cvs2git tool.

@@ -511,7 +526,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-cvsimport.txt b/git-cvsimport.txt index 3985e0164..fdd7ec7ed 100644 --- a/git-cvsimport.txt +++ b/git-cvsimport.txt @@ -13,7 +13,7 @@ SYNOPSIS [-A ] [-p ] [-P ] [-C ] [-z ] [-i] [-k] [-u] [-s ] [-a] [-m] [-M ] [-S ] [-L ] - [] + [-r ] [] DESCRIPTION @@ -25,10 +25,12 @@ Splitting the CVS log into patch sets is done by 'cvsps'. At least version 2.1 is required. You should *never* do any work of your own on the branches that are -created by git-cvsimport. The initial import will create and populate a +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 'git merge' incremental imports, or -any CVS branches, yourself. +any CVS branches, yourself. It is advisable to specify a named remote via +-r to separate and protect the incoming branches. + OPTIONS ------- @@ -51,10 +53,19 @@ OPTIONS The git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory. +-r :: + The git remote to import this CVS repository into. + Moves all CVS branches into remotes// + akin to the git-clone --use-separate-remote option. + -o :: - The 'HEAD' branch from CVS is imported to the 'origin' branch within - the git repository, as 'HEAD' 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 'HEAD' branch + from CVS is imported to the 'origin' branch within the git + repository, as 'HEAD' already has a special meaning for git. + When a remote is specified the 'HEAD' branch is named + remotes//master mirroring git-clone behaviour. + Use this option if you want to import into a different + branch. + Use '-o master' for continuing an import that was initially done by the old cvs2git tool.