GIT: useful commands

Checkout and start tracking remote branch:

git checkout --track origin/branchname

Publish and create tracking connection for new local branch:

git push -u <remote> <branch>

Revert changes made to your working copy:

git checkout .

Revert changes made to the index: (i.e., that you have added). Warning this will reset all of your unpushed commits to master!

git reset

Revert a change that you have committed:

git revert <commit 1> <commit 2>

Remove untracked files (e.g., new files, generated files):

git clean -f

Remove untracked directories (e.g., new or automatically generated directories):

git clean -fd

Remove ignored files (e.g., IDE configuration):

git clean -fX

Remove ignored directories (e.g., IDE configuration, target dir)
git clean -fdX

Rebase develop branch to master. (Develop will be checked out):

git rebase master develop

Delete branch with all its commits:

git branch -D <branch-name>

Create patch file of staged changes (ignore whitespace differences, like line endings):

git diff --cached --ignore-space-change >> patch.diff

Clean up list of remote branches

git remote prune <origin>

sources:

• https://stackoverflow.com/questions/1146973/how-do-i-revert-all-local-changes-in-git-managed-project-to-previous-state
• https://stackoverflow.com/questions/7726949/remove-tracking-branches-no-longer-on-remote
• https://git-scm.com/docs/git-diff
• https://git-scm.com/docs/git-rebase