From 03a4c52a5f221137a162e23a4b56620c3d26acd1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 28 Feb 2006 00:10:01 +0000 Subject: [PATCH] Autogenerated man pages for v1.2.2-gf3a4 --- man1/git-svnimport.1 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/man1/git-svnimport.1 b/man1/git-svnimport.1 index c49bb846..8e47f32e 100755 --- a/man1/git-svnimport.1 +++ b/man1/git-svnimport.1 @@ -23,7 +23,7 @@ git-svnimport \- Import a SVN repository into git .SH "SYNOPSIS" -\fIgit\-svnimport\fR [ \-o ] [ \-h ] [ \-v ] [ \-d | \-D ] [ \-C ] [ \-i ] [ \-u ] [\-l limit_rev] [ \-b branch_subdir ] [ \-T trunk_subdir ] [ \-t tag_subdir ] [ \-s start_chg ] [ \-m ] [ \-r ] [ \-M regex ] [ \-I ] [ ] +\fIgit\-svnimport\fR [ \-o ] [ \-h ] [ \-v ] [ \-d | \-D ] [ \-C ] [ \-i ] [ \-u ] [\-l limit_rev] [ \-b branch_subdir ] [ \-T trunk_subdir ] [ \-t tag_subdir ] [ \-s start_chg ] [ \-m ] [ \-r ] [ \-M regex ] [ \-I ] [ \-A ] [ ] .SH "DESCRIPTION" @@ -80,6 +80,21 @@ Prepend \fIrX: \fR to commit messages, where X is the imported subversion revisi Import the svn:ignore directory property to files with this name in each directory\&. (The Subversion and GIT ignore syntaxes are similar enough that using the Subversion patterns directly with "\-I \&.gitignore" will almost always just work\&.) .TP +\-A +Read a file with lines on the form + +.nf +username = User's Full Name +.fi + +.nf +and use "User's Full Name " as the GIT +author and committer for Subversion commits made by +"username"\&. If encountering a commit made by a user not in the +list, abort\&. +.fi + +.TP \-m Attempt to detect merges based on the commit message\&. This option will enable default regexes that try to capture the name source branch name from the commit message\&. -- 2.11.0