Update Update Guide authored by Jonathan Jones's avatar Jonathan Jones
...@@ -20,22 +20,16 @@ user@host:~/repo/blocks$ git checkout <branch> ...@@ -20,22 +20,16 @@ user@host:~/repo/blocks$ git checkout <branch>
``` ```
You now have three choices: You now have three choices:
1. Commit the changes to the current branch, because you know you want them 1. Commit the changes to the current branch, because you know you want them:
2. Delete the changes by reverting to the previous commit, because you know you don't want them
3. Store the changes locally, because you're not sure if you want them yet
In case 1, you do:
``` bash ``` bash
user@host:~/repo/blocks$ git commit -am "<commit message>" user@host:~/repo/blocks$ git commit -am "<commit message>"
user@host:~/repo/blocks$ git push user@host:~/repo/blocks$ git push
``` ```
2. Delete the changes by reverting to the previous commit, because you know you don't want them:
In case 2, you do:
``` bash ``` bash
user@host:~/repo/blocks$ git reset --hard HEAD user@host:~/repo/blocks$ git reset --hard HEAD
``` ```
3. Store the changes locally, because you're not sure if you want them yet:
In case 3, you do:
``` bash ``` bash
user@host:~/repo/blocks$ git stash user@host:~/repo/blocks$ git stash
``` ```
... ...
......