git checkout . //Discards changes in workspace and resets to last commit git checkout -- file //removes changes to a particular file git clean -n //list untracked files to be deleted git clean -f //remove untracked files git status //gives a list of modifications to workspace git add . // selects all modified files to be staged git diff //gives a diff of modified files, pre staging git commit //commits all staged files git reset git log --pretty=oneline //commit history one line each git commit --amend git config --global diff.tool bc git config --global merge.tool bc git config --global difftool.prompt false gitk // see all commits gui