Rebase vs Merge in Git

2009-04-01