= Reverting outstanding changes = git reset HEAD --hard HEAD = Possibly fixing things = git rebase origin/master = Branching = git clone git@github.com:k0s/mozrunner.git cd mozrunner/ git branch audit git checkout audit git branch git remote add harthur http://github.com/harthur/mozrunner.git git pull harthur rewrite git push origin audit = Making a new branch = git push origin origin:refs/heads/audit - that will create a new head (branch) on github git checkout --track -b audit origin/audit - to stick your local branch to the remote one == Remote branches == see also: - http://github.com/guides/git-cheat-sheet - http://stackoverflow.com/questions/9537392/git-fetch-remote-branch git checkout --track origin/daves_branch git branch -a git branch --track hotfix-1.5.1 mozauto/hotfix-1.5.1 git checkout -b bug-671420 origin/bug-671420 === Deleting a remote branch === git push origin :bug-583834 === Merging from master === git merge master = Finding a common ancestor = git merge-base HEAD hotfix-1.5.2 = Getting the changes on a branch = git diff $(git merge-base HEAD master) = Getting this diff without commiting with added files = git diff --cached = Delete a remote Git tag = git tag -d 12345 git push origin :refs/tags/12345 = http://github.com/ = == comparing branches == http://github.com/k0s/mozmill/compare/master...fix-profile-redundancy == getting a diff == https://github.com/name/repo/pull/6.diff