サクッと使いこなすためのgit stash Tips & stashの仕組み ref: http://qiita.com/ton1517/items/9888a78f6b063e748558

file0.txt

$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   bar
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   hoge
#

file1.txt

$ git stash -k

file10.txt

$ ls -a
.  ..  .git  bar  hoge

file11.txt

$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   bar
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   hoge
#

file12.txt

$ git stash
$ git stash pop

file13.txt

$ git status
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   bar
#       modified:   hoge
#
no changes added to commit (use "git add" and/or "git commit -a")

file14.txt

$ git stash
$ git stash pop --index

file15.txt

$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   bar
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   hoge
#

file16.txt

$ git stash list
stash@{0}: WIP on master: 8b7ca77 initial commit.

file17.txt

$ git log --graph stash@{0}

*   commit ee5d8bdf21c6dfedb6b5a648241a20eff01b2418
|\  Merge: 8b7ca77 9dcce8a
| | Author: ton <[email protected]>
| | Date:   Sat Oct 19 14:57:25 2013 +0900
| | 
| |     WIP on master: 8b7ca77 initial commit.
| |   
| * commit 9dcce8af3e987391fcd1cdd2be95785b25c04944
|/  Author: ton <[email protected]>
|   Date:   Sat Oct 19 14:57:25 2013 +0900
|   
|       index on master: 8b7ca77 initial commit.
|  
* commit 8b7ca77846392852f4c9b0304b16116369b712ce
  Author: ton <[email protected]>
  Date:   Sat Oct 19 12:07:03 2013 +0900

      initial commit.

file18.txt

*-.   commit 90c6264e964f3dea2f7d418c49491a360630b387
|\ \  Merge: 8b7ca77 351051a 4ad4d67
| | | Author: ton <[email protected]>
| | | Date:   Sat Oct 19 15:41:51 2013 +0900
| | | 
| | |     WIP on master: 8b7ca77 initial commit.
| | |    
| | * commit 4ad4d67f4a8fd9e31da2f1e49c7f78f7b4db37f1
| |   Author: ton <[email protected]>
| |   Date:   Sat Oct 19 15:41:51 2013 +0900
| |   
| |       untracked files on master: 8b7ca77 initial commit.
| |   
| * commit 351051a076c5e0170acab6047dd15f67ac910fbe
|/  Author: ton <[email protected]>
|   Date:   Sat Oct 19 15:41:51 2013 +0900
|   
|       index on master: 8b7ca77 initial commit.
|  
* commit 8b7ca77846392852f4c9b0304b16116369b712ce
  Author: ton <[email protected]>
  Date:   Sat Oct 19 12:07:03 2013 +0900

      initial commit.

file2.txt

$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   bar
#

file3.txt

$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   bar
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   hoge
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       foo

file4.txt

$ git stash -u

file5.txt

$ git status
# On branch master
nothing to commit, working directory clean

file6.txt

$ git status
# On branch master
nothing to commit, working directory clean

file7.txt

$ git ls-files
bar
hoge

file8.txt

$ ls -a
.  ..  .DS_Store  .Trashes  .directory  .git  bar  hoge  tags

file9.txt

$ git stash -a