Git: Cherry-Pick to working copy without commit

If you are using Terminal

git cherry-pick -n <HASH>

If you are using Intellij Idea

Settings -> Version Control -> git
untick commit automatically on cherry-pick 

Use '-n' flag with the cherry-picking which is "no commit"

See here: http://git-scm.com/docs/git-cherry-pick

git cherry-pick -n <HASH>

To then unstage the staged changes

git reset

For IntelliJ users

Settings > Version Control > Git: Uncheck Commit automatically on cherry-pick

enter image description here

Update

This feature was removed and set to true by default. There are many complains and maybe they will return it back.

Meanwhile you can achieve the same result with "Cherry-Pick Selected Changes" from commit view (as mentioned in the thread shared by Neo):

enter image description here


You can also use apply instead of cherry-pick if you're just trying to apply all the changes you made in a commit to your working directory:

git show <commit> | git apply

This will apply the changes made in but will not add them to staging or create a commit.

Tags:

Git