Another one: git pull --rebase. If you&#x27;ve made a commit or two but others have pushed before you&#x27;ve had a change to pull, you can do a rebase to avoid the separate branch and merge that a regular git pull will attempt to do. I don&#x27;t know if I&#x27;d trust it on very out of date branches though.