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 movi

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.