Cave 5

Sometimes, you delete a branch and if you run git branch -a it still listed under /remote. One way to sync your local branches is to execute the following: git fetch -p After fetching, will remove any remote-tracking branches which no longer exist on the remote. from man git-fetch

git difftool somebranch:UNREADME otherbranch:README from stackoverflow

Delete local branch "serverfix": git branch -d serverfix Delete remote branch "serverfix": git push origin :serverfix progit.org