I'd also call out git-stack [0] as an option Visualize current tree: $ git stack Show what the ideal tree will be post-pull: $ git stack --pull --dry-run P

I'd also call out git-stack [0] as an option Visualize current tree: $ git stack Show what the ideal tree will be post-pull: $ git stack --pull --dry-run Perform pull and show the actual tree (e.g. we don't handle merge-conflicts): $ git stack --pull In addition, the above command snapshots the state of all of your branches and prints out the command to undo everything in case something is off [0] https://github.com/epage/git-stack https://github.com/epage/git-stack