====== Git Cheat Sheet ======

These are the commands that I look up the most to make sure I'm doing them right. Eventually I'll remember them...

===== Branches =====

==== Create a new branch from current changes ====

This will create the new branch. When the branch is created, it will be active with the changes from the old branch. Switching back to the old branch will no longer show the changes.

<code>
$ git checkout -b <new branch>
</code>

==== Create upstream branch from local branch ====

Commit any local changes then:

<code>
$ git push -u origin <new branch>
</code>

==== Delete a local branch ====

<code>
$ git branch -D <branchName>
Deleted branch <branchName> (was ....).
</code>

==== Delete a remote branch ====

<code>
$ git push origin --delete <branchName>
To git@github.com:<repository>.git
 - [deleted]         <branchName>
</code>

If someone already deleted the remote branch, synchronize your local branch list with:

<code>
$ git fetch --prune
</code>

==== Merge ====

Merge branch into current branch

<code>
$ git merge <branch>
</code>