diff options
| author | Adam Bard <github@adambard.com> | 2014-11-25 22:08:44 +0100 |
|---|---|---|
| committer | Adam Bard <github@adambard.com> | 2014-11-25 22:08:44 +0100 |
| commit | d97c65924e40ffd501fc3636bbd5245f443f36df (patch) | |
| tree | d36bf7630110c86379cc939cec3473684341f3e0 | |
| parent | 76bf69f50104e71f51515db25a9c20b812c3aa47 (diff) | |
| parent | 0e42f4c928b1414102467f539b313c1646e91093 (diff) | |
Merge pull request #876 from LOZORD/master
[git/en] Fixed some markdown formatting issuses
| -rw-r--r-- | git.html.markdown | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/git.html.markdown b/git.html.markdown index f94fadee..04350dd5 100644 --- a/git.html.markdown +++ b/git.html.markdown @@ -341,8 +341,8 @@ $ git push 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 are not able to run 'git pull'. -Instead, you can run 'git stash' to save your changes onto a stack! +Since you have dirty (uncommited) 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! ```bash $ git stash @@ -353,10 +353,11 @@ Saved working directory and index state \ ``` Now you can pull! + ```bash git pull ``` -...changes apply... +`...changes apply...` Now check that everything is OK @@ -366,8 +367,9 @@ $ git status nothing to commit, working directory clean ``` -You can see what 'hunks' you've stashed so far: -Since the 'hunks' are stored in a Last-In-First-Out stack our most recent change will be at top +You can see what "hunks" you've stashed so far using `git stash list`. +Since the "hunks" are stored in a Last-In-First-Out stack, our most recent change will be at top. + ```bash $ git stash list stash@{0}: WIP on master: 049d078 added the index file @@ -375,7 +377,8 @@ stash@{1}: WIP on master: c264051 Revert "added file_size" stash@{2}: WIP on master: 21d80a5 added number to log ``` -Now let's apply our dirty changes back by popping them off the stack +Now let's apply our dirty changes back by popping them off the stack. + ```bash $ git stash pop # On branch master @@ -386,6 +389,7 @@ $ git stash pop # modified: lib/simplegit.rb # ``` + `git stash apply` does the same thing Now you're ready to get back to work on your stuff! |