git stash
git stash save "desc"
git stash list
git stash apply stash@{n} : 不删除
git stash pop
git stash
git stash clear
git stash drop stash@{n}
git stash show -p stash@{n} > diff.log
#冲突
git stash
#解决冲突
git reset HEAD
补丁文件及导入
git diff > diff.log
git apply --check diff.log
git apply diff.log
如果有冲突
git apply --reject diff.log
git diff
git diff --diff-filter=ACDMR
A: added
C: copied
D: deleted
M: modified
R: renamed