Browse files

Updated documentation

  • Loading branch information...
1 parent 1aefb65 commit 7411c425e3891dba548028e4c6a20ec724d66f45 @soxofaan committed Oct 28, 2011
Showing with 6 additions and 7 deletions.
  1. +4 −5 README.rst
  2. +2 −2
@@ -63,12 +63,12 @@ that are used for interal housekeeping:
It is vital that these the content pointed to by these two branches
is the same, meaning that the diff between the two should be empty.
However, this does not mean that these two branches point at the same
-Git commit. On the contrary, only at initialisation they will point
-to the same Git commit. Due to the syncing approach, the branches will follow their
+Git commit. On the contrary, they will point to the same Git commit,
+only at initialisation or, in some cases, they won't share any history at all.
+Due to the syncing approach, the branches will follow their
own seprate history with separate git commits.
As already noted, they should never be merged, so from the standpoint of Git, they
-diverge in terms of commits.
-In terms of raw content on the other hand, they point to the same.
+diverge in terms of commits. But in terms of raw content, they will be "in sync".
A typical initialization is starting from an existing SVN repo and convert it to Git,
@@ -96,7 +96,6 @@ The script does not make an assumption here.
TODO ...
@@ -7,7 +7,7 @@ die() {
exit 1
-# The git master branch that has to be synced to SVN.
+# The git master branch to which SVN has to be synced to.
# The branch that is used to interface with SVN through git-svn rebase and dcommit.
@@ -17,7 +17,7 @@ gitside=svn-sync/git-side
-# Handy for dedbugging
+# Handy for debugging
set -x
# Set pointer to last commit from current SVN branch.

0 comments on commit 7411c42

Please sign in to comment.