Common git commands

git.txt

Show remote branches:
	git branch -v -a	

To check out the remote branch:
	http://stackoverflow.com/questions/1783405/checkout-remote-git-branch
	git fetch
	git checkout <branch>


Create and checkout a local branch:
	git checkout -b <NAME>

Push a local branch to remote:
	git push origin <NAME>

Delete local branch
	git branch -d <branch_name>

Undo last commit locally:
	git reset --hard HEAD~1


To prevent having to type in your username every time:

	in .git/config for the given project:
		change url from this -> https://github.com/PowerShellMafia/PowerSploit/
		to something like this -> url = https://harmj0y@github.com/PowerShellMafia/PowerSploit/

To pull PRs:
	Add "fetch = +refs/pull/*/head:refs/remotes/origin/pr/*" under [remote "origin"]
	in .git/config

To pull a PR change:
	git checkout origin/pr/118
	git pull


# unstage a file (so it’s not committed)
git reset HEAD <file>...


closing issues with tagging:
	git commit -m "closes #104"

squashing unpunished commits-
	http://stackoverflow.com/questions/6934752/combining-multiple-commits-before-pushing-in-git

squash other commits-
	http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git
	
	new messages:
		git reset --soft HEAD~3 &&
		git commit

	preserving messages:
		git reset --soft HEAD~3 && 
		git commit --edit -m"$(git log --format=%B --reverse HEAD..HEAD@{1})"