How do I discard changes in my working copy that are not in the index?
git stash save --keep-index --include-untracked
You don't need to include –include-untracked if you don't want to be thorough about it.
or drop the stash
git stash drop
or all unstaged files in current working directory use:
git checkout -- .
For a specific file use:
git checkout -- path/to/file/to/revert
Add alias:
git branch -a| grep xxx
# ~/.gitconfig
[alias]
squash = "!f(){ git reset --soft HEAD~${1} && git commit --edit -m\"$(git log --format=%B --reverse HEAD..HEAD@{1})\"; };f"
last = log -1 HEAD
bag = "!f() { git branch -a | grep ${1} --color=auto; }; f"
