Changes between Version 21 and Version 22 of UsingGitWithWebKit

Timestamp:

Jun 25, 2009 8:37:57 AM (15 years ago)

Author:

treat@kde.org

Comment:

Make this more explicit.

UsingGitWithWebKit

@@ -39 +39 @@
 == Updating ==
 
-If you're new to git, this command pulls updates from the repository that you previously cloned:
+If you are tracking the svn repository, this command will fetch information about new commits from svn, reset your local branch to match svn exactly, and then apply your local commits on top:
 
 {{{
-   git pull
+   git svn rebase
 }}}
 
-If you are also tracking the svn repository, this will update the svn-based {{{trunk}}} branch in git:
+If you are tracking the svn repository, this command will fetch information about new commits from svn:
 
 {{{
@@ -51 +51 @@
 }}}
 
-If the current branch is based on the svn repository, this command will pull in commits from svn and rebase local commits on top of them:
-
-{{{
-   git svn rebase
-}}}
 
 == WebKit Script support for Git ==