Skip to content

Instantly share code, notes, and snippets.

Doing a staging cut

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

When you begin working on a feature

Step 1: Update the main branch

   git checkout master
   git pull origin master

Step 2: Create a feature branch off of the main branch

tmux cheatsheet

As configured in my dotfiles.

start new:

tmux

start new with session name:

@santosh79
santosh79 / installing mysql python on snow leopard
Created August 27, 2010 01:39
installing mysql python on snow leopard
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.
@santosh79
santosh79 / stuff_required_for_heroku_bkup.sh
Created August 14, 2010 22:57
Installing required gems & making backup of heroku db
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;