DenkzeitWiki

Rebasing

In short, rebase will remove your local patches from a repo, update it to the latest upstream, then re-apply your local changesets ? aborting to have you fix any conflicts. This is as opposed to a more traditional merge, where you add the upstream changesets to your local branch and then commit new changesets to resolve conflicts. [1]

• http://changelog.complete.org/archives/586-rebase-considered-harmful
• rebase vs. merge
• http://stackoverflow.com/questions/804115/git-rebase-vs-git-merge
• http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html
• The Case for Git Rebase
  
• http://blog.experimentalworks.net/2009/03/merge-vs-rebase-a-deep-dive-into-the-mysteries-of-revision-control/
  • Never ever rebase a branch that you pushed, or that you pulled from another person.
  
  
• http://blog.bitquabit.com/2008/11/25/rebasing-mercurial/
  • The answer lies in rebasing. Rebasing is a technique made popular by git where you rewrite your not-yet-pushed patches so that they apply against the current remote tip, rather than against the tip of the repository you happened to last pull. The benefit is that your merge history shows useful merges—merges between major branches—rather than simply every single merge you did with the upstream repository.
  
  
• http://kbullock.ringworld.org/2009/04/24/on-rebasing/