User Tools
Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision | Last revision Both sides next revision | ||
|
cs:git:start [2017/09/11 15:48] Sean Kallaher [Commit Often, then Squash Later] |
cs:git:start [2017/09/11 15:48] Sean Kallaher [Quick reference] |
||
|---|---|---|---|
| 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> | ||
