Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
| git [2024/11/15 18:10] – mgupton | git [2024/12/13 12:37] (current) – [Branches] mgupton | ||
|---|---|---|---|
| Line 1: | Line 1: | ||
| - | ======Git====== | + | ======git====== |
| A general guide for the distributed version control system Git. | A general guide for the distributed version control system Git. | ||
| Line 122: | Line 122: | ||
| ====== Branches ====== | ====== Branches ====== | ||
| + | * Checkout the branch the new branch is based on | ||
| + | * Then create branch | ||
| + | <code bash> | ||
| + | git branch <new branch name> | ||
| + | </ | ||
| + | * Create a ranch and check it out in one command | ||
| <code bash> | <code bash> | ||
| git checkout -b <new branch name> | git checkout -b <new branch name> | ||
| Line 127: | Line 133: | ||
| === Deleting Branches === | === Deleting Branches === | ||
| + | * Delete remote branch, if it exists | ||
| + | * Then delete the local branch | ||
| + | <code bash> | ||
| + | git push -d < | ||
| + | git branch -d <branch name> | ||
| + | </ | ||
| + | |||
| + | To force delete an unmerged branch | ||
| <code bash> | <code bash> | ||
| - | git push -d <remote_name> | + | git branch |
| - | git branch | + | |
| </ | </ | ||