Rename git branch locally and remotely

In case you have created a branch with a wrong name and pushed your branch to the remote git repository you can follow these steps to change the name of your branch.

git branch -m old_branch new_branch # Rename branch locally
git push origin :old_branch # Delete the old branch
git push –set-upstream origin new_branch # Push the new branch, set local branch to track the new remote

Please note, if you use the name of the branch somewhere in your build scripts or somewhere else like SonarQube you have to change it there also.

Remove uncommitted changes from your working directory in GIT

There is a easy solution to remove all uncommitted changes from your working directory in GIT

git fetch origin
git reset --hard origin/master

Note: After executing this command, all uncommitted changes will be removes from your working directory. If you want to save the current work before removing all uncommitted changes, you can do:

git commit -a -m "Backup my work before reset"
git branch backup

Now your work is saved on the branch “backup” in case you decide you want to backup your work to look at it later or diff it.