Use Developer branches
(Difference between revisions)
(New page: Imagine you want to try out the xfce4-svn branch from developer elangelo. You can see this branch [http://foo-projects.org/git/?p=elangelo/moonbase.git;a=shortlog;h=refs/heads/xfce4-svn he...) |
|||
Line 18: | Line 18: | ||
git checkout xfce4-svn | git checkout xfce4-svn | ||
git merge master | git merge master | ||
+ | lin xfce4 | ||
* telling lunar to use the git repository instead of the default (/var/lib/lunar/moonbase) one: | * telling lunar to use the git repository instead of the default (/var/lib/lunar/moonbase) one: | ||
lunar set MOONBASE /home/samuel/moonbase.git | lunar set MOONBASE /home/samuel/moonbase.git | ||
+ | |||
+ | * you're tired of xfce4-svn and want to try elangelo's xorg branch: | ||
+ | cd /home/samuel/moonbase.git | ||
+ | git checkout master | ||
+ | git pull git://lunar-linux.org/elangelo/moonbase.git xorg:xorg | ||
+ | git checkout xorg | ||
+ | git merge master | ||
+ | lunar renew | ||
+ | |||
+ | * you want to use both xfce4-svn and the xorg branch: | ||
+ | cd /home/samuel/moonbase.git | ||
+ | git checkout master | ||
+ | git branch xfce4-svn_xorg | ||
+ | git checkout xfce4-svn_xorg | ||
+ | git merge xorg | ||
+ | git merge xfce4-svn | ||
+ | lunar renew | ||
+ | |||
+ | * you are tired of all those branches: | ||
+ | git checkout master | ||
+ | git branch -D xfce4-svn | ||
+ | git branch -D xorg | ||
+ | git branch -D xfce4-svn_xorg |
Revision as of 09:47, 16 April 2009
Imagine you want to try out the xfce4-svn branch from developer elangelo. You can see this branch here.
These would be the commands:
- clone the main repository lunar:
git clone git://lunar-linux.org/lunar/moonbase.git moonbase.git
- pull the xfce4-svn branch from elangelo and at the same time create a local xfce4-svn branch
cd moonbase.git git pull git://lunar-linux.org/elangelo/moonbase.git xfce4-svn:xfce4-svn
- switch to the xfce4-svn branch:
git checkout xfce4-svn
- updating the xfce4-svn branch with latest master (the main repository of moonbase)
git checkout master git pull git://lunar-linux.org/lunar/moonbase.git master git checkout xfce4-svn git merge master lin xfce4
- telling lunar to use the git repository instead of the default (/var/lib/lunar/moonbase) one:
lunar set MOONBASE /home/samuel/moonbase.git
- you're tired of xfce4-svn and want to try elangelo's xorg branch:
cd /home/samuel/moonbase.git git checkout master git pull git://lunar-linux.org/elangelo/moonbase.git xorg:xorg git checkout xorg git merge master lunar renew
- you want to use both xfce4-svn and the xorg branch:
cd /home/samuel/moonbase.git git checkout master git branch xfce4-svn_xorg git checkout xfce4-svn_xorg git merge xorg git merge xfce4-svn lunar renew
- you are tired of all those branches:
git checkout master git branch -D xfce4-svn git branch -D xorg git branch -D xfce4-svn_xorg