…often, the timeline gets polluted with unnecessary micro-merges on regular git pull . Rebasing ensures that the commits are always re-applied so that the history stays linear.
You can configure certain branches to always do this without the --rebase flag: # make `git pull` on master always use rebase $ git config branch.master.rebase true
You can also set up a global option to set the last property for every new tracked branch: # setup rebase for every tracking branch $ git config --global …
- Labnotes: Rounded Corners 256 — Sharpening the saw
- The Queue Blog: Link dump for July 24th through July 25th
- Tammer Saleh: The Modern Vim Config with Pathogen
- Trevor Turk: Homebrew is my Homie
- Katz Got Your Tongue?: My Common Git Workflow
- Falling Leaves - Home: Anachronic and Vines, calling time on my plugin virginity
…git so much as the fact that rebasing is easier the closer it's done to the actual commits. Rebasing your own commits a-la git pull --rebase is more or less the same difficulty as merging (most of the time).
However if you go back to rebase a sequence that has a bunch of merge commits in it, git-rebase will not be able to make use of any conflict resolution done in those merges. This is because the individual commits are replayed one by one in temporal order, which means conflicts that …
- JarrodSpillers.com: git merge vs git rebase: avoiding rebase hell