python (65.1k questions)

javascript (44.2k questions)

reactjs (22.7k questions)

java (20.8k questions)

c# (17.4k questions)

html (16.3k questions)

r (13.7k questions)

android (12.9k questions)

Questions - git-cherry-pick

Is there sort of a reverse cherry-pick in Git?

tl;dr: How can I keep the current last couple of commits on a branch, and replace the history before that with that of another branch? I have a branch where I want to keep the existing last 3 commits...
test-img

Sled

git

git-rebase

git-cherry-pick

Votes: 0

Answers: 2

Latest Answer

So is there some opposite of cherry-pick where you can insert the past commit You have the right idea, but you are over thinking it. Instead of inserting past commits, you can create a new branch an...
test-img

Code-Apprentice

git cherry-pick says nothing to commit

(note: this is not a duplicate question, see explanation below) I first checkout master as a detached branch: % git checkout --detach master HEAD is now at fff9e1e687 modserver/go: skip Spotlight auto...
test-img

Victor de Fontnouvelle

git

github

cherry-pick

git-cherry-pick

git-detached-head

Votes: 0

Answers: 2

Latest Answer

git diff 65b12d9d32 compares the tree as of commit 65b12d9d32 to your current working copy. Since your working copy is clean, it's equivalent to git diff HEAD 65b12d9d32 On the other hand, git cherry-...
test-img

IMSoP

Is there a way to make 'git cherry-pick -x' only record the most recent 'cherry-picked from' message?

When we use git cherry-pick -x <commit>, it records the source commit in the commit message as follows (cherry picked from commit 5f2662a29efaa91af6b356df2d5d1df69017cac1) I have a bunch of comm...
test-img

rks

git

git-cherry-pick

Votes: 0

Answers: 1

Latest Answer

No, that's the way it works. But you have alternatives: You can use the --edit option (thanks @joanis for pointing out in the comments) With this option, git cherry-pick will let you edit the commi...
test-img

kapsiR

git cherry-pick all missing commits between two branches from the same master

I have the following situation: two branches were created from master at different times T0 T1 ----+-----------------+------> master | | | ...
test-img

Shari Menson

git

git-branch

branching-and-merging

git-cherry-pick

Votes: 0

Answers: 2

Latest Answer

Untested, but git switch BranchB # Use git checkout BranchB if you prefer. git cherry-pick ..BranchA should work. Taken from the examples section of https://git-scm.com/docs/git-cherry-pick.
test-img

Andrew McClement

Posts

Questions

Blogs

Jobs