From mboxrd@z Thu Jan 1 00:00:00 1970 From: wmorgan-sup@masanjin.net (William Morgan) Date: Wed, 09 Jan 2008 09:57:31 -0800 Subject: [sup-talk] new in git: 'next' branch Message-ID: <1199901343-sup-7480@south> As part of a general effort to make Sup development both more organized and easier to contribute to, I've created a branch on the shared repo called "next". I'm going to try and push any changes not obviously trivial to next, and only migrate them to master once they've had some exposure. The goal is that, if you track master, you should get a Sup that's just as stable as a distribution, if not more so, and if you track next, you should get a Sup that has the latest and greatest features, but might break every once in a while. Neither of these branches will be rebased, which means, for those of you not intimately familiar with git arcana, that a "git pull" will always work (module changes you've made locally, of course). GIT CRASH-COURSE ---------------- To track next, command your computer as follows: $ git branch next origin/next Branch next set up to track remote branch refs/remotes/origin/next. $ git checkout next Switched to branch "next" $ git pull Already up-to-date. You can switch back to master with "git checkout master". Note that git won't let you switch if you have uncommitted changes, so make use of "git stash" to stash them away with a nice label. -- William