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

Only bashified the code sections

Browse Source
This commit is contained in:
LOZORD 2014-11-24 19:39:44 -06:00
parent 3a8b9f0fc5
commit 8b442c2497
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
git.html.markdown
View File

@ -336,40 +336,45 @@ $ git push
### stash ### stash
Stashing takes the dirty state of your working directory and saves it on a 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.
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!
```bash ```bash
# 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!
$ git stash $ git stash
Saved working directory and index state \ Saved working directory and index state \
"WIP on master: 049d078 added the index file" "WIP on master: 049d078 added the index file"
HEAD is now at 049d078 added the index file HEAD is now at 049d078 added the index file
(To restore them type "git stash apply") (To restore them type "git stash apply")
```
# Now you can pull! Now you can pull!
```bash
git pull git pull
# ...changes apply... ```
...changes apply...
# Now check that everything is OK Now check that everything is OK
```bash
$ git status $ git status
# On branch master # On branch master
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:
# Since the 'hunks' are stored in a Last-In-First-Out stack Since the 'hunks' are stored in a Last-In-First-Out stack our most recent change will be at top
# our most recent change will be at top ```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
stash@{1}: WIP on master: c264051 Revert "added file_size" 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
# 'git stash apply' also works too ```bash
$ git stash pop $ git stash pop
# On branch master # On branch master
# Changes not staged for commit: # Changes not staged for commit:
@ -378,9 +383,10 @@ $ git stash pop
# modified: index.html # modified: index.html
# modified: lib/simplegit.rb # modified: lib/simplegit.rb
# #
```
'git stash apply' also works too
# Now you're good to go! Now you're ready to get back to work on your stuff!
[Additional Reading.](http://git-scm.com/book/en/v1/Git-Tools-Stashing) [Additional Reading.](http://git-scm.com/book/en/v1/Git-Tools-Stashing)
### rebase (caution) ### rebase (caution)