User Tools
Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision Next revision Both sides next revision | ||
|
cs:git:start [2016/08/19 21:11] Sean Kallaher [Branches] |
cs:git:start [2016/09/02 13:26] Brandon Kallaher [Getting Started] |
||
|---|---|---|---|
| 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:software_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. How we use git is very much tied to the overall [[:cs:sw_workflow/|software development workflow]], so I recommend reading that as well. |
| ===== Getting Started ===== | ===== Getting Started ===== | ||
| - | I highly recommend you start out by going over our intro tutorial to git, which describes a few high-level concepts that are important to understand before you start using git. For reference, you can find the official git documentation [[https://git-scm.com/doc|here]]. | + | I highly recommend you start out by going over our intro tutorial to git, which describes a few high-level concepts that are important to understand before you start using git. For reference, you can find the official git documentation [[https://git-scm.com/doc|here]]. An interactive tool for learning Git is [[http://try.github.io|Try Git]]. |
| Line 56: | Line 56: | ||
| ===== 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 dev. |
| - | * ''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> |
