diff options
Diffstat (limited to 'man1/git-svn.1')
| -rw-r--r-- | man1/git-svn.1 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/man1/git-svn.1 b/man1/git-svn.1 index a38241f5c..5bcf6af86 100644 --- a/man1/git-svn.1 +++ b/man1/git-svn.1 @@ -2,12 +2,12 @@ .\" Title: git-svn .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/21/2023 +.\" Date: 03/28/2023 .\" Manual: Git Manual -.\" Source: Git 2.40.0.130.g27d43aaaf5 +.\" Source: Git 2.40.0.141.g8d90352acc .\" Language: English .\" -.TH "GIT\-SVN" "1" "03/21/2023" "Git 2\&.40\&.0\&.130\&.g27d43a" "Git Manual" +.TH "GIT\-SVN" "1" "03/28/2023" "Git 2\&.40\&.0\&.141\&.g8d9035" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -774,7 +774,7 @@ git svn fetch .RS 4 .\} .nf - r1\-\-\-r2\(aq\-\-r3\(aq remotes/git\-svn + r1\-\-\-r2\*(Aq\-\-r3\*(Aq remotes/git\-svn \e r2\-\-\-r3\-\-\-A\-\-\-B master .fi @@ -804,9 +804,9 @@ git rebase \-\-onto remotes/git\-svn A^ master .RS 4 .\} .nf - r1\-\-\-r2\(aq\-\-r3\(aq remotes/git\-svn + r1\-\-\-r2\*(Aq\-\-r3\*(Aq remotes/git\-svn \e - A\(aq\-\-B\(aq master + A\*(Aq\-\-B\*(Aq master .fi .if n \{\ .RE @@ -1221,7 +1221,7 @@ Tracking and contributing to the trunk of a Subversion\-managed project (ignorin git svn clone http://svn\&.example\&.com/project/trunk # Enter the newly cloned directory: cd trunk -# You should be on master branch, double\-check with \(aqgit branch\(aq +# You should be on master branch, double\-check with \*(Aqgit branch\*(Aq git branch # Do some work and commit locally to Git: git commit \&.\&.\&. @@ -1253,7 +1253,7 @@ Tracking and contributing to an entire Subversion\-managed project (complete wit git branch \-r # Create a new branch in SVN git svn branch waldo -# Reset your master to trunk (or any other branch, replacing \(aqtrunk\(aq +# Reset your master to trunk (or any other branch, replacing \*(Aqtrunk\*(Aq # with the appropriate name): git reset \-\-hard svn/trunk # You may only dcommit to one branch/tag/trunk at a time\&. The usage @@ -1277,14 +1277,14 @@ The initial \fIgit svn clone\fR can be quite time\-consuming (especially for lar cd project git init git remote add origin server:/pub/project - git config \-\-replace\-all remote\&.origin\&.fetch \(aq+refs/remotes/*:refs/remotes/*\(aq + git config \-\-replace\-all remote\&.origin\&.fetch \*(Aq+refs/remotes/*:refs/remotes/*\*(Aq git fetch # Prevent fetch/pull from remote Git server in the future, # we only want to use git svn for future updates git config \-\-remove\-section remote\&.origin # Create a local branch from one of the branches just fetched git checkout \-b master FETCH_HEAD -# Initialize \(aqgit svn\(aq locally (be sure to use the same URL and +# Initialize \*(Aqgit svn\*(Aq locally (be sure to use the same URL and # \-\-stdlayout/\-T/\-b/\-t/\-\-prefix options as were used on server) git svn init http://svn\&.example\&.com/project [options\&.\&.\&.] # Pull the latest changes from Subversion @@ -1315,7 +1315,7 @@ Note that this may mean that multiple Git commits are created for a single SVN r An example: in an SVN repository with a standard trunk/tags/branches layout, a directory trunk/sub is created in r\&.100\&. In r\&.200, trunk/sub is branched by copying it to branches/\&. \fIgit svn clone \-s\fR will then create a branch \fIsub\fR\&. It will also create new Git commits for r\&.100 through r\&.199 and use these as the history of branch \fIsub\fR\&. Thus there will be two Git commits for each revision from r\&.100 to r\&.199 (one containing trunk/, one containing trunk/sub/)\&. Finally, it will create a branch \fIsub@200\fR pointing to the new parent commit of branch \fIsub\fR (i\&.e\&. the commit for r\&.200 and trunk/sub/)\&. .SH "CAVEATS" .sp -For the sake of simplicity and interoperating with Subversion, it is recommended that all \fIgit svn\fR users clone, fetch and dcommit directly from the SVN server, and avoid all \fIgit clone\fR/\fIpull\fR/\fImerge\fR/\fIpush\fR operations between Git repositories and branches\&. The recommended method of exchanging code between Git branches and users is \fIgit format\-patch\fR and \fIgit am\fR, or just \(aqdcommit\(cqing to the SVN repository\&. +For the sake of simplicity and interoperating with Subversion, it is recommended that all \fIgit svn\fR users clone, fetch and dcommit directly from the SVN server, and avoid all \fIgit clone\fR/\fIpull\fR/\fImerge\fR/\fIpush\fR operations between Git repositories and branches\&. The recommended method of exchanging code between Git branches and users is \fIgit format\-patch\fR and \fIgit am\fR, or just \*(Aqdcommit\(cqing to the SVN repository\&. .sp Running \fIgit merge\fR or \fIgit pull\fR is NOT recommended on a branch you plan to \fIdcommit\fR from because Subversion users cannot see any merges you\(cqve made\&. Furthermore, if you merge or pull from a Git branch that is a mirror of an SVN branch, \fIdcommit\fR may commit to the wrong branch\&. .sp |