From c4d891baf8078c785e0e230dfa70565a41d92220 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 16 Jan 2006 00:23:33 -0800
Subject: [PATCH] Autogenerated man pages for v1.1.2-g4230

---
 man1/git-cvsimport.1 | 27 +++++++++++++++++++++++++++
 man1/git-push.1      |  6 +++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1
index aa89209e..57d4a1d3 100755
--- a/man1/git-cvsimport.1
+++ b/man1/git-cvsimport.1
@@ -102,6 +102,33 @@ Pass the timestamp fuzz factor to cvsps\&.
 \-s <subst>
 Substitute the character "/" in branch names with <subst>
 
+.TP
+\-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
+
+.nf
+exon=Andreas Ericsson <ae@op5\&.se>
+spawn=Simon Pawn <spawn@frog\-pond\&.org>
+.fi
+
+.nf
+git\-cvsimport will make it appear as those authors had
+their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
+all along\&.
+.fi
+
+.nf
+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\&.
+.fi
+
+.nf
+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\&.
+.fi
+
 .SH "OUTPUT"
 
 
diff --git a/man1/git-push.1 b/man1/git-push.1
index 9819c64f..54677a36 100755
--- a/man1/git-push.1
+++ b/man1/git-push.1
@@ -23,7 +23,7 @@ git-push \- Update remote refs along with associated objects.
 .SH "SYNOPSIS"
 
 
-git\-push [\-\-all] [\-\-force] <repository> <refspec>...
+git\-push [\-\-all] [\-\-tags] [\-\-force] <repository> <refspec>...
 
 .SH "DESCRIPTION"
 
@@ -170,6 +170,10 @@ A parameter <ref> without a colon is equivalent to <ref>: when pulling/fetching,
 Instead of naming each ref to push, specifies all refs to be pushed\&.
 
 .TP
+\-\-tags
+All refs under $GIT_DIR/refs/tags are pushed, in addition to refspecs explicitly listed on the command line\&.
+
+.TP
 \-f, \-\-force
 Usually, the command refuses to update a local ref that is not an ancestor of the remote ref used to overwrite it\&. This flag disables the check\&. What this means is that the local repository can lose commits; use it with care\&.
 
-- 
2.11.0