From: Junio C Hamano Date: Mon, 16 Jan 2006 08:23:23 +0000 (-0800) Subject: Autogenerated HTML docs for v1.1.2-g4230 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=02d6fa5ce12d061b1c86f1b76d7bdac8c57e6f0c;p=git.git Autogenerated HTML docs for v1.1.2-g4230 --- diff --git a/git-cvsimport.html b/git-cvsimport.html index 20f90f06..9295c054 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -425,6 +425,39 @@ the old cvs2git tool.

Substitute the character "/" in branch names with <subst>

+
+-A <author-conv-file> +
+
+

+ CVS by default uses the unix username when writing its + commit logs. Using this option and an author-conv-file + in this format +

+
+
+
exon=Andreas Ericsson <ae@op5.se>
+spawn=Simon Pawn <spawn@frog-pond.org>
+
+
+
+
git-cvsimport will make it appear as those authors had
+their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
+all along.
+
+
+
+
For convenience, this data is saved to $GIT_DIR/cvs-authors
+each time the -A option is provided and read from that same
+file each time git-cvsimport is run.
+
+
+
+
It is not recommended to use this feature if you intend to
+export changes back to CVS again later with
+git-link[1]::git-cvsexportcommit.
+
+

OUTPUT

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

diff --git a/git-cvsimport.txt b/git-cvsimport.txt index 01ca7ef9..dfe86cee 100644 --- a/git-cvsimport.txt +++ b/git-cvsimport.txt @@ -89,6 +89,26 @@ If you need to pass multiple options, separate them with a comma. -s :: Substitute the character "/" in branch names with +-A :: + CVS by default uses the unix username when writing its + commit logs. Using this option and an author-conv-file + in this format + + exon=Andreas Ericsson + spawn=Simon Pawn + + git-cvsimport will make it appear as those authors had + their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly + all along. + + For convenience, this data is saved to $GIT_DIR/cvs-authors + each time the -A option is provided and read from that same + file each time git-cvsimport is run. + + It is not recommended to use this feature if you intend to + export changes back to CVS again later with + git-link[1]::git-cvsexportcommit. + OUTPUT ------ If '-v' is specified, the script reports what it is doing. diff --git a/git-push.html b/git-push.html index 52a5642e..1f1334bb 100644 --- a/git-push.html +++ b/git-push.html @@ -272,7 +272,7 @@ git-push(1) Manual Page

SYNOPSIS

-

git-push [--all] [--force] <repository> <refspec>…

+

git-push [--all] [--tags] [--force] <repository> <refspec>…

DESCRIPTION

@@ -523,6 +523,16 @@ A parameter <ref> without a colon is equivalent to

+--tags +
+
+

+ All refs under $GIT_DIR/refs/tags are pushed, in + addition to refspecs explicitly listed on the command + line. +

+
+
-f, --force
@@ -549,7 +559,7 @@ A parameter <ref> without a colon is equivalent to
diff --git a/git-push.txt b/git-push.txt index 2254bac1..365cfd41 100644 --- a/git-push.txt +++ b/git-push.txt @@ -8,7 +8,7 @@ git-push - Update remote refs along with associated objects. SYNOPSIS -------- -'git-push' [--all] [--force] ... +'git-push' [--all] [--tags] [--force] ... DESCRIPTION ----------- @@ -29,6 +29,11 @@ include::pull-fetch-param.txt[] Instead of naming each ref to push, specifies all refs to be pushed. +\--tags:: + All refs under `$GIT_DIR/refs/tags` are pushed, in + addition to refspecs explicitly listed on the command + line. + -f, \--force:: Usually, the command refuses to update a local ref that is not an ancestor of the remote ref used to overwrite it.