diff options
| author | Milo Gilad <milogaccnts@gmail.com> | 2017-08-25 10:18:31 -0400 |
|---|---|---|
| committer | Milo Gilad <milogaccnts@gmail.com> | 2017-08-25 10:18:31 -0400 |
| commit | a6c3a64a4c897a1f7e7acfbfe6318866317770ad (patch) | |
| tree | 28b0d35aaf2cdc3e968e182f1de4d5c5e596a970 /git.html.markdown | |
| parent | 1abae4b25de43e05df3ba225986997bc72eb3f8a (diff) | |
| parent | bce21489d8d7e3a3f3d4ede2154dba082647296e (diff) | |
Merge branch 'master' of github.com:adambard/learnxinyminutes-docs
Diffstat (limited to 'git.html.markdown')
| -rw-r--r-- | git.html.markdown | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git.html.markdown b/git.html.markdown index 1cd2578e..088c109f 100644 --- a/git.html.markdown +++ b/git.html.markdown @@ -432,7 +432,7 @@ Stashing takes the dirty state of your working directory and saves it on a stack of unfinished changes that you can reapply at any time. Let's say you've been doing some work in your git repo, but you want to pull -from the remote. Since you have dirty (uncommited) changes to some files, you +from the remote. Since you have dirty (uncommitted) changes to some files, you are not able to run `git pull`. Instead, you can run `git stash` to save your changes onto a stack! @@ -521,7 +521,7 @@ $ git reset --hard $ git reset 31f2bb1 # Moves the current branch tip backward to the specified commit -# and makes the working dir match (deletes uncommited changes and all commits +# and makes the working dir match (deletes uncommitted changes and all commits # after the specified commit). $ git reset --hard 31f2bb1 ``` |