git
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
| git [2016/05/14 16:04] – external edit 127.0.0.1 | git [2023/08/18 18:15] (current) – external edit 127.0.0.1 | ||
|---|---|---|---|
| Line 1: | Line 1: | ||
| ====== Git Cheat Sheet ====== | ====== 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 ===== | ===== Branches ===== | ||
| - | Delete a local branch | + | ==== 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. | ||
| + | |||
| + | < | ||
| + | $ git checkout -b <new branch> | ||
| + | </ | ||
| + | |||
| + | ==== Create upstream branch from local branch ==== | ||
| + | |||
| + | Commit any local changes then: | ||
| + | |||
| + | < | ||
| + | $ git push -u origin <new branch> | ||
| + | </ | ||
| + | |||
| + | ==== Delete a local branch | ||
| < | < | ||
| $ git branch -D < | $ git branch -D < | ||
| Line 10: | Line 28: | ||
| </ | </ | ||
| - | Delete a remote branch | + | ==== Delete a remote branch |
| < | < | ||
| $ git push origin --delete < | $ git push origin --delete < | ||
| Line 16: | Line 35: | ||
| - [deleted] | - [deleted] | ||
| </ | </ | ||
| + | |||
| + | If someone already deleted the remote branch, synchronize your local branch list with: | ||
| + | |||
| + | < | ||
| + | $ git fetch --prune | ||
| + | </ | ||
| + | |||
| + | ==== Merge ==== | ||
| + | |||
| + | Merge branch into current branch | ||
| + | |||
| + | < | ||
| + | $ git merge < | ||
| + | </ | ||
| + | |||
| + | |||
git.1463241895.txt.gz · Last modified: 2023/08/18 18:15 (external edit)