Merge pull request #292 from rahulkavale/master

Add stash, cherry-pick, revert in git cheat
This commit is contained in:
Chris Lane 2016-09-30 20:40:20 -04:00 committed by GitHub
commit 403d715127
1 changed files with 25 additions and 0 deletions

View File

@ -11,6 +11,24 @@ git config --global color.ui true
# To stage all changes for commit: # To stage all changes for commit:
git add --all git add --all
# To stash changes locally, this will keep the changes in a separate changelist
# called stash and the working directory is cleaned. You can apply changes
# from the stash anytime
git stash
# To stash changes with a message
git stash save "message"
# To list all the stashed changes
git stash list
# To apply the most recent change and remove the stash from the stash list
git stash pop
# To apply any stash from the list of stashes. This does not remove the stash
# from the stash list
git stash apply stash@{6}
# To commit staged changes # To commit staged changes
git commit -m "Your commit message" git commit -m "Your commit message"
@ -124,3 +142,10 @@ git show :/cool
# Undo parts of last commit in a specific file # Undo parts of last commit in a specific file
git checkout -p HEAD^ -- /path/to/file git checkout -p HEAD^ -- /path/to/file
# Revert a commit and keep the history of the reverted change as a separate revert commit
git revert <commit SHA>
# Pich a commit from a branch to current branch. This is different than merge as
# this just applies a single commit from a branch to current branch
git cherry-pick <commit SHA1>