Changes between Version 11 and Version 12 of UsingGitWithWebKit

Timestamp:

Dec 13, 2007, 7:16:34 PM (17 years ago)

Author:

ddkilzer@apple.com

Comment:

--

UsingGitWithWebKit

@@ -20 +20 @@
 == Checkout ==
 
+To checkout WebKit using git:
+
 {{{
-   git clone git://git.webkit.org/WebKit.git
+   git clone git://git.webkit.org/WebKit.git WebKit
+}}}
+
+If you'd also like to track the svn repository:
+
+{{{
+   cd WebKit
+   git update-ref refs/remotes/trunk origin/master
+   git svn init -T trunk http://svn.webkit.org/repository/webkit
 }}}
 
 == Updating ==
 
-In case you're new to git, this command pulls updates from the repository you cloned during checkout:
+In case you're new to git, this command pulls updates from the repository that you previously cloned:
 
 {{{
    git pull
+}}}
+
+If you are also tracking the svn repository, this will update the {{{trunk}}} branch in git:
+
+{{{
+      git svn fetch
+}}}
+
+If the current branch is based on the svn repository, this command will pull in commits from svn and rebase local changes on top of them:
+
+{{{
+   git svn rebase
 }}}