Rebase master to b108

[zfs] / GIT

diff --git a/GIT b/GIT
index eea0b4e6a16c1aeac6ecf7528c9aa6ac8821b4aa..5293cb5ed931fb252a1175c4ba1e70ad0418454d 100644 (file)
--- a/GIT
+++ b/GIT
@@ -36,7 +36,7 @@ the latest version of TopGit which likely is not packaged nicely so you
 will need to build it from source.  You can use Git to clone TopGit
 from the official site here and your all set:
 
-        > git clone git://repo.or.cz/w/topgit.git
+        > git clone git://repo.or.cz/topgit.git
         > make
         > make install    # Default installs to $(HOME)
 
@@ -49,10 +49,21 @@ LLNL you can clone the latest official repo here.  Cloning a TopGit
 controlled repo is very similar to cloning a normal Git repo, but you
 need to remember to use 'tg remote' to populate all topic branches.
 
-        > git clone http://eris.llnl.gov/git/zfs.git zfs
+        > git clone git://eris.llnl.gov/zfs.git
         > cd zfs
         > tg remote --populate origin
 
+Alternately, if you don't want to worry about using TopGit on your system
+you can simply clone the repo and then checkout the origin/top branch.  At
+this point you can simply create a new branch to track your changes.  You
+can then feed your patch back to the official repo maintainers to be merged
+in to the proper topic branches.
+
+       > git clone git://eris.llnl.gov/zfs.git
+       > cd zfs
+       > git checkout origin/top
+       > git checkout -b <new_branch_name>
+
 Now that you have the Linux ZFS repo the first thing you will probably 
 want to do is have a look at all the topic branches.  TopGit provides
 a summary command which shows all the branches and a brief summary for