Differences

This shows you the differences between two versions of the page.

--- docs:git:working_copies_of_multiple_branches [2009/11/08 00:55] – billh
+++ docs:git:working_copies_of_multiple_branches [2009/11/08 01:07] (current) – billh
@@ Line 9: / Line 9: @@
 cd /foo/base
 git branch alt
+  (make sure you have a branch called 'alt' in the main repo before cloning)
 cd ..
 git clone /foo/base /foo/alt
@@ Line 19: / Line 20: @@
 git pull
 git push origin alt
-  (you can also just run 'git push')
+  (you can also just run 'git push' unless you don't want to update other branches)
+</code>
+Your .git/config file will show the alt branch configured like this:<code>
+[branch "alt"]
+    remote = origin
+    merge = refs/heads/alt
 </code>
@@ Line 82: / Line 89: @@
 You should now be able to 'git pull' and merge any changes from the main repo.
+===== External Links =====
+* [[http://www.sourcemage.org/Git_Guide|Git Guide]] (see section titled **I want to work on an upstream branch other than "master"**)