Git rebase workflow and git ahead and behind messages

Update: Just set it up to be automatic.

For all new projects:

git config --global branch.autosetuprebase always

For existing projects:

git config branch.master.rebase true

Courtesy Randy Fay's blog post, "Simpler Rebasing (avoiding unintentional merge commits)"

git pull --rebase
rebasing applies your changes on top of the fetched commits.

sfreudenberg: does that still make sense when we are collaborating on a branch? Or does that workflow suggest we always work on our own branches, and can pull --rebase them in from one another, and then

http://randyfay.com/node/91

Seems like the full rebase workflow will also get rid of the annoying "commits ahead of master" messages.

http://stackoverflow.com/questions/1741143/git-pull-origin-mybranch-leaves-local-mybranch-n-commits-ahead-of-ori...