When working on a pull requests it happens more often then not, that you have to push multiple commits to one pull request. Of course you don't want to have all of them in the master, so what do you do? You squash them. That's not problem locally, but just

With the command git diff targetbranch you can see all changes from one branch to another. But sometimes you only want to see the files changed, not the actual changes. For this there is a extra flag called --name-only: $ git diff --name-only master

When you want to change the last commit you can use git --amend to change the commit message or the files included. When you want to update the user information, you have to use it directly in the call. git commit --amend --author="Name "

When using multiple git branches it can happen, that you loose track of which branch tracks which other. Or maybe even whether branches track any branch. Here [http://stackoverflow.com/questions/4950725/how-do-i-get-git-to-show-me-which-branches-are-tracking-what] is a nice little script to show the ones that track another remote branch and which: git

Sometimes it happens that you mess up your local git repository or just have to many changes you don't need any more. There is a simple way to reset your local git repository to the connected origin branch: $ git reset --hard origin/master In this case you would reset to