This involves taking what is in mainline(master) and moving it to staging.
git checkout staging
git pull origin staging
git checkout master
git pull origin master
git merge staging
git checkout staging
As configured in my dotfiles.
start new:
tmux
start new with session name:
This is assuming that you are using the stock version of python that comes with snow leopard. As of 8/26/2010 this is 2.6.1 64-bit version. | |
1. Download & Install "Mac OS X ver. 10.6 (x86, 64-bit), DMG Archive" from http://dev.mysql.com/downloads/mysql/ | |
2. Ensure there are no mysql connector fragments in /Library/Python/2.6/site-packages. | |
a) sudo rm /Library/Python/2.6/site-packages/_my* | |
b) sudo rm -rf MySQLdb lpMySQL_python-1.2.3-py2.6-macosx-10.6-universal.egg | |
Basically, ensure there are no files that could be possibly be mysql related in /Library/Python/2.6/site-packages. Err on the side of removal. |
cd; | |
curl -O http://www.sqlite.org/sqlite-3.7.0.1.tar.gz; | |
tar xzf sqlite-3.7.0.1.tar.gz; | |
cd sqlite-3.7.0.1; | |
./configure --prefix=/usr/local; | |
make; | |
sudo make install; | |
cd .. && rm -rf sqlite-3.7.0.1 && rm sqlite-3.7.0.1.tar.gz; | |
sudo gem install sqlite3-ruby --no-rdoc --no-ri; | |
sudo gem install taps --no-rdoc --no-ri; |