User Tools
Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
cs:git:start [2017/09/11 15:48] Sean Kallaher [Commit Often, then Squash Later] |
cs:git:start [2022/04/15 02:13] (current) Chris Nathman [Introduction] |
||
|---|---|---|---|
| Line 2: | Line 2: | ||
| ===== Introduction ===== | ===== Introduction ===== | ||
| - | Git is a powerful and useful tool, but if used improperly it can be a clusterfuck for managing code. This page is designed to serve as a basic introduction to git, outline how Robosub is using git, and links to helpful information. How we use git is very much tied to the overall [[:cs:sw_workflow/|software development workflow]], so I recommend reading that as well. | + | Git is a powerful and useful tool, but if used improperly it can be a clusterfuck for managing code. This page is designed to serve as a basic introduction to git, outline how Robosub is using git, and links to helpful information. |
| ===== Getting Started ===== | ===== Getting Started ===== | ||
| Line 54: | Line 54: | ||
| ===== Quick reference ===== | ===== Quick reference ===== | ||
| * ''git fetch'' retrieve the latest changes from the server | * ''git fetch'' retrieve the latest changes from the server | ||
| - | * ''git rebase <other branch>'' rebase your current branch on top of <other branch>, which typically should be dev. | + | * ''git rebase <other branch>'' rebase your current branch on top of <other branch>, which typically should be master. |
| * ''git checkout <file/directory name>'' reset all unstaged changes to <file/directory name> | * ''git checkout <file/directory name>'' reset all unstaged changes to <file/directory name> | ||
