iskm/learnxinyminutes-docs
1
0
Fork 0
mirror of https://github.com/adambard/learnxinyminutes-docs.git synced 2024-12-23 17:41:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some markdown formatting issuses

Browse Source
This commit is contained in:
Leo Rudberg 2014-11-25 13:47:03 -06:00
parent b7f4ca7ea8
commit 0e42f4c928
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
git.html.markdown
View File

@ -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. 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. 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'. 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! Instead, you can run `git stash` to save your changes onto a stack!
```bash ```bash
$ git stash $ git stash
@ -353,10 +353,11 @@ Saved working directory and index state \
``` ```
Now you can pull! Now you can pull!
```bash ```bash
git pull git pull
``` ```
...changes apply... `...changes apply...`
Now check that everything is OK Now check that everything is OK
@ -366,8 +367,9 @@ $ git status
nothing to commit, working directory clean nothing to commit, working directory clean
``` ```
You can see what 'hunks' you've stashed so far: 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 Since the "hunks" are stored in a Last-In-First-Out stack, our most recent change will be at top.
```bash ```bash
$ git stash list $ git stash list
stash@{0}: WIP on master: 049d078 added the index file 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 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 ```bash
$ git stash pop $ git stash pop
# On branch master # On branch master
@ -386,6 +389,7 @@ $ git stash pop
# modified: lib/simplegit.rb # modified: lib/simplegit.rb
# #
``` ```
`git stash apply` does the same thing `git stash apply` does the same thing
Now you're ready to get back to work on your stuff! Now you're ready to get back to work on your stuff!