Using Git

add the pandas remote repository to your fork and name it upstream

git remote add upstream git://github.com/pydata/pandas

pull in the latest upstream changes without merging

git fetch upstream

fetch changes from upstream and rebase off of latest upstream/master changes

git fetch upstream
git rebase upstream/master

fetch and then rebase interactively to squash, reword, fix, otherwise change some commits

git fetch upstream
git rebase --interactive upstream/master

This tip allows you to rebase relative to upstream/master which allows you to do squash commits from the point at which your fork diverged from pandas upstream

Making your git life easier when hacking on pandas

list your global git config values

git config --list --global

don't clobber file permissions

git config --global core.filemode false

keep the line endings the same as the input file, i.e., don't convert them to your platform

git config --global core.autocrlf input