Git: Cherry-Pick to working copy without commit

Question

I have several branches where I keep certain commits that I want to apply to my working copy every now and then. Initially I tried cherry-picking but I do not want to have the commit in the target branch later.

So I did cherry-pick + reset HEAD~1 --soft

Is there something simpler like cherry-picking to working copy only?

You have the '-n' flag which means "no commit". See here: http://git-scm.com/docs/git-cherry-pick — Igal S., Sep 01 '15 at 13:52

score 636 · Accepted Answer · edited Feb 22 '22 at 15:41

636

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

edited Feb 22 '22 at 15:41

Jeremy Moritz

13,864
7
39
43

answered Sep 01 '15 at 13:56

Igal S.

13,146
5
30
48

51

`-n` brings the commit to staged area. In order to unstage it `git reset HEAD` would be neccessary. – Vishnu N K Feb 13 '18 at 10:57
1

Just `git reset` is enough. – Krishna Sep 23 '20 at 16:21
For future readers, who need after this one to pick only certain parts of the commit: use 'git add -p' to select the chunks you need – e.ad Feb 09 '23 at 18:36

score 24 · Answer 2 · answered Sep 16 '19 at 05:41

24

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

answered Sep 16 '19 at 05:41

Ravinda Lakshan

1,006
14
14

https://intellij-support.jetbrains.com/hc/en-us/community/posts/4404012212882-Setting-Commit-automatically-on-cherry-pick-disappeared-in-2021-2-Beta-2 – Neo Jun 14 '22 at 08:35

score 17 · Answer 3 · answered Apr 13 '21 at 19:38

17

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.

answered Apr 13 '21 at 19:38

adamgy

4,543
3
16
31

4

The (dis)advantage of this is that it will not handle conflicts. – artless noise Aug 30 '22 at 16:10

Trayan Momkov · Answer 4 · 2022-06-20T08:00:48.377

14

For IntelliJ users

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

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):

edited Jun 20 '22 at 08:00

answered Apr 14 '20 at 13:48

Trayan Momkov

842
1
7
18

1

This feature is not available as of IntelliJ IDEA 2021.2.1 (CE). – Ricardo Jan 06 '22 at 21:40
Yes, unfortunately :/ – Trayan Momkov Jan 07 '22 at 18:38
1

https://intellij-support.jetbrains.com/hc/en-us/community/posts/4404012212882-Setting-Commit-automatically-on-cherry-pick-disappeared-in-2021-2-Beta-2 – Neo Jun 14 '22 at 08:34
https://youtrack.jetbrains.com/issue/IDEA-275207/Commit-automatically-on-cherry-pick-settings-is-no-longer-available-in-PhpStorm-20212 – Neo Jun 14 '22 at 08:34
Exactly what I'm looking for. Thank you! Sorry that I can't ask a precise question to match this answer. – daifei4321 May 23 '23 at 21:41

score 6 · Answer 5 · answered Jun 28 '21 at 17:54

6

Simply run:

$ git cherry-pick --no-commit <HASH>

answered Jun 28 '21 at 17:54

moriarty007

2,054
16
20

rofrol · Answer 6 · 2020-05-12T15:52:31.017

2

I was getting errors that error: server/metadata/metadata-preui-prod.xml: No such file or directory

So now I do this

git checkout SHA -- server/metadata && git reset -- server/met adata

Old

git show SHA -- file1.txt file2.txt | git apply -

or all files from SHA

git show SHA | git apply -

How to git-cherry-pick only changes to certain files?

edited May 12 '20 at 15:52

answered Jul 08 '19 at 10:00

rofrol

14,438
7
79
77

score 1 · Answer 7 · answered Dec 20 '21 at 12:43

To solve this in Visual Studio 2019 without opening a console I went to the "Git Repository" window and right clicked on the Git Commit history and did a cherry pick on the commit I wanted. This commits the cherry pick. But then I did a right click on the commit below and did a "Reset -> Keep changes (--mixed)" which reset the commit but kept the changes uncommitted.

Git: Cherry-Pick to working copy without commit

7 Answers7

For IntelliJ users

Old

Linked

Related