From 4104ef2aa995f428fe563cfa173eccbf1f3790e9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 7 Jan 2007 07:44:08 +0000 Subject: [PATCH] Autogenerated man pages for v1.5.0-rc0-g13e86 --- man1/git-clone.1 | 6 +++--- man1/git-svn.1 | 10 +++++----- man1/git-svnimport.1 | 9 +++++++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/man1/git-clone.1 b/man1/git-clone.1 index a183bc880..eb4608c02 100644 --- a/man1/git-clone.1 +++ b/man1/git-clone.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\-CLONE" "1" "01/02/2007" "" "" +.TH "GIT\-CLONE" "1" "01/07/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -17,9 +17,9 @@ git\-clone \- Clones a repository [\-\-depth=] [] .fi .SH "DESCRIPTION" -Clones a repository into a newly created directory, creates remote\-tracking branches for each branch in the cloned repository (visible using git branch \-r), and creates and checks out a master branch equal to the cloned repository's master branch. +Clones a repository into a newly created directory, creates remote\-tracking branches for each branch in the cloned repository (visible using git branch \-r), and creates and checks out an initial branch equal to the cloned repository's currently active branch. -After the clone, a plain git fetch without arguments will update all the remote\-tracking branches, and a git pull without arguments will in addition merge the remote master branch into the current branch. +After the clone, a plain git fetch without arguments will update all the remote\-tracking branches, and a git pull without arguments will in addition merge the remote master branch into the current master branch, if any. This default configuration is achieved by creating references to the remote branch heads under $GIT_DIR/refs/remotes/origin and by initializing remote.origin.url and remote.origin.fetch configuration variables. .SH "OPTIONS" diff --git a/man1/git-svn.1 b/man1/git-svn.1 index 6ec6ecfda..c4c8a3d4a 100644 --- a/man1/git-svn.1 +++ b/man1/git-svn.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\-SVN" "1" "01/05/2007" "" "" +.TH "GIT\-SVN" "1" "01/07/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -30,7 +30,7 @@ Note: You should never attempt to modify the remotes/git\-svn branch outside of See \fIAdditional Fetch Arguments\fR if you are interested in manually joining branches on commit. .TP \fIdcommit\fR -Commit all diffs from a specified head directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). It is recommended that you run git\-svn fetch and rebase (not pull) your commits against the latest changes in the SVN repository. An optional command\-line argument may be specified as an alternative to HEAD. This is advantageous over \fIset\-tree\fR (below) because it produces cleaner, more linear history. +Commit each diff from a specified head directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in git. It is recommended that you run git\-svn fetch and rebase (not pull or merge) your commits against the latest changes in the SVN repository. An optional command\-line argument may be specified as an alternative to HEAD. This is advantageous over \fIset\-tree\fR (below) because it produces cleaner, more linear history. .TP \fIlog\fR This should make it easy to look up svn log messages when svn users refer to \-r/\-\-revision numbers. @@ -262,10 +262,10 @@ Tracking and contributing to an entire Subversion\-managed project (complete wit # Check for new branches and tags (no arguments are needed): git\-svn multi\-init .fi -.SH "REBASE VS. PULL" -Originally, git\-svn recommended that the remotes/git\-svn branch be pulled from. This is because the author favored \fIgit\-svn set\-tree B\fR to commit a single head rather than the \fIgit\-svn set\-tree A..B\fR notation to commit multiple commits. +.SH "REBASE VS. PULL/MERGE" +Originally, git\-svn recommended that the remotes/git\-svn branch be pulled or merged from. This is because the author favored \fIgit\-svn set\-tree B\fR to commit a single head rather than the \fIgit\-svn set\-tree A..B\fR notation to commit multiple commits. -If you use \fIgit\-svn set\-tree A..B\fR to commit several diffs and you do not have the latest remotes/git\-svn merged into my\-branch, you should use \fIgit rebase\fR to update your work branch instead of \fIgit pull\fR. \fIpull\fR can cause non\-linear history to be flattened when committing into SVN, which can lead to merge commits reversing previous commits in SVN. +If you use \fIgit\-svn set\-tree A..B\fR to commit several diffs and you do not have the latest remotes/git\-svn merged into my\-branch, you should use \fIgit rebase\fR to update your work branch instead of \fIgit pull\fR or \fIgit merge\fR. \fIpull/merge\fR can cause non\-linear history to be flattened when committing into SVN, which can lead to merge commits reversing previous commits in SVN. .SH "DESIGN PHILOSOPHY" Merge tracking in Subversion is lacking and doing branched development with Subversion is cumbersome as a result. git\-svn does not do automated merge/branch tracking by default and leaves it entirely up to the user on the git side. .SH "TRACKING MULTIPLE REPOSITORIES OR BRANCHES" diff --git a/man1/git-svnimport.1 b/man1/git-svnimport.1 index 9421272b7..93db432ed 100644 --- a/man1/git-svnimport.1 +++ b/man1/git-svnimport.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\-SVNIMPORT" "1" "12/17/2006" "" "" +.TH "GIT\-SVNIMPORT" "1" "01/07/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -17,7 +17,7 @@ git\-svnimport \- Import a SVN repository into git [ \-b branch_subdir ] [ \-T trunk_subdir ] [ \-t tag_subdir ] [ \-s start_chg ] [ \-m ] [ \-r ] [ \-M regex ] [ \-I ] [ \-A ] - [ \-P ] + [ \-R ] [ \-P ] [ ] .fi .SH "DESCRIPTION" @@ -80,6 +80,11 @@ Specify a maximum revision number to pull. Formerly, this option controlled how many revisions to pull, due to SVN memory leaks. (These have been worked around.) .TP +\-R +Specify how often git repository should be repacked. + +The default value is 1000. git\-svnimport will do import in chunks of 1000 revisions, after each chunk git repository will be repacked. To disable this behavior specify some big value here which is mote than number of revisions to import. +.TP \-P Partial import of the SVN tree. -- 2.26.2