Stash
git stash [save] – stores your local changes away and revert them to the baseline
git stash pop – retrieves changes stored via git stash, removes them from the storage and applies to the local copy using merge.
git stash apply – retrieves changes stored via git stash (without removing from storage) and merges them to the local copy.
git stash drop – drops the currently stashed changes from the storage.
Resolving conflicts
git add "fileWithResolvedConflicts" – Declares that all conflicts have been resolved in file fileWithResolvedConflicts.
Tags
git tag – list the tags
git tag X – sets the X tag
git tag -a “version” -m “message” – sets a tag named “version” with a commit message
git tag -d X – removes the tag X
git push --tags – pushes all the tags
git push origin X – pushes tag X.
Log
git log – show the commit/tag log
git log --name-status – shows the log with changed files