$ git status
On branch toMerge
Your branch is up-to-date with 'origin/toMerge'.
Changes not staged for commit:
modified: temp.html
no changes added to commit (use "git add" and/or "git commit -a")
$ git stash
Saved working directory and index state WIP on toMerge: d653a75 k
HEAD is now at d653a75k
$ git status
On branch toMerge
Your branch is up-to-date with 'origin/toMerge'.
nothing to commit, working directory cleangit s
2.查看现有stash,git stash list
$ git stash list
stash@{0}: On toMerge: 20190326save //使用命令git stash save "20190326save"可对每次stash编写备注,便于识别
stash@{1}: WIP on toMerge: d653a75k
$ git stash pop
On branch toMerge
Your branch is up-to-date with 'origin/toMerge'.
Changes not staged for commit:
modified: temp.html
Dropped refs/stash@{0} (b59e084518353760c03ac17fff9947e9f5c50e11)
$ git stash list
stash@{0}: WIP on toMerge: d653a75 k
$ git stash apply
On branch toMerge
Your branch is up-to-date with 'origin/toMerge'.
Changes not staged for commit:
modified: temp.html
no changes added to commit (use "git add" and/or "git commit -a")
$ git stash list
stash@{0}: On toMerge: 20190326save
stash@{1}: WIP on toMerge: d653a75 k
4.移除stash,git stash drop/git stash clear
git stash drop stash@{$num} ,移除指定的stash,git stash clear,删除所有的stash。
$ git stash list
stash@{0}: On toMerge: 20190326save
stash@{1}: WIP on toMerge: d653a75 k
$ git stash drop stash@{0}
Dropped stash@{0} (ab5e2af36f68665665328306a0a6f019ffbbbf49)
$ git stash list
stash@{0}: WIP on toMerge: d653a75 k
5.查看stash的diff,git stash show
git stash show stash@{$num} ,如果不带参数,则会查看最新stash的diff,在该命令后面添加-p或--patch可以查看特定stash的全部diff。
$ git stash list
stash@{0}: WIP on toMerge: d653a75 k
$ git stash branch stashbranch2
Switched to a new branch 'stashbranch2'
On branch stashbranch2
Changes not staged for commit:
modified: temp.html
no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (291fab4caa71b0bb8ec8b75911f14c2b3d808a3e)
$ git stash list //没有内容了