--- gitsvn version 3 Mon Feb 11 05:17:12 +0000 2008
+++ gitsvn version 4 Sun May 04 20:20:17 +0000 2008
@@ -1,51 +1,23 @@
-Installing:
-MacPorts users, sudo port install git-core +svn
+Tracking and contributing to the trunk of a Subversion-managed project:
-** Branching, committing, and pushing one large change to SVN via GIT (Thanks
-Chris (errtheblog.com) for the tip)
+# Clone a repo (like git clone):
+ git-svn clone http://svn.foo.org/project/trunk
+# Enter the newly cloned directory:
+ cd trunk
+# You should be on master branch, double-check with git-branch
+ git branch
+# Do some work and commit locally to git:
+ git commit ...
+# Something is committed to SVN, rebase your local changes against the
+# latest changes in SVN:
+ git-svn rebase
+# Now commit your changes (that were committed previously using git) to SVN,
+# as well as automatically updating your working HEAD:
+ git-svn dcommit
+# Append svn:ignore settings to the default git exclude file:
+ git-svn show-ignore >> .git/info/exclude
-git svn rebase
-git checkout -b new_branch
-... do your work / local commits ...
-
-git checkout master
-
-git svn rebase
-
-git checkout -b up
-
-git merge --squash new_branch
-
-git commit
-
-git svn dcommit
-
-git checkout master
-
-git svn rebase
-
-git branch -D new_branch up
-
-
-**NOTE: Versions of git-svn 1.5.3.4+ let you merge normally to your master
-branch
-Worklflow under 1.5.3.4+ version:
-
-git svn clone <svn_repo>
-
-git checkout -b <work_branch>
-
-...hack...hack...
-
-git commit -a
-
-git checkout master
-
-git svn rebase
-
-git merge <work_branch> #NOTE: no need for --squash anymore
-
-git svn dcommit -e # -e will let you enter a commit message for SVN
+http://www.kernel.org/pub/software/scm/git/docs/git-svn.html
