4 ms·

Could really use a section on rebase, which is a key differentiating feature, and just as essential as merge IMO. But then I can sympathize that it might be a

• schacon 16y ago
  in most cases, merge will always do where people use rebase. rebase is only _really_ necessary when you're trying to keep a patch series up to date with a moving upstream head. i wanted to keep the basic reference simple, just the commands that most people need most of the time. i will add more sections to the site - probably including a workflow section that goes over rebase vs merge workflows.