For me, I found it very useful to stop using tracking branches. This means I move all of my branch pointers manually and once you get used to it, you’ll begin t

For me, I found it very useful to stop using tracking branches. This means I move all of my branch pointers manually and once you get used to it, you’ll begin to find rebases and cherry-picks more intuitive. In fact, it’s made me really distaste merge commits in general. Flow might be something like: git checkout master git checkout -b my_branch git push origin my_branch ... git fetch git log -p origin/my_branch git reset --hard origin/my_branch