Stack Overflow
Stack Overflow

Questions tagged [cherry-pick]

In source control management, the act of selectively pulling single changes from peer to peer is called "cherry-pick".

448 questions
0
votes
2 answers

In sourcetree how can I avoid messages "(cherry picked from xxx)"?

In the last version of sourcetree (3.1.3), when I cherry-pick commits, the new commit includes a comment (cherry picked from xxx). I don't want that message. I read somewhere else it is the result of option -x in git cherry-pick. So probably there…
Florian F
  • 1,300
  • 1
  • 12
  • 28
0
votes
0 answers

How to cherry pick commits OUT

I need to remove code from my master branch... Currently, it looks like this: A->B->C->D->E->F and i want to remove commits B to E, turning it to: A->F I tried to revert back to A and cherry pick F but it won't allow me to push because the tip of…
Leonardo
  • 10,737
  • 10
  • 62
  • 155
0
votes
1 answer

How to get the changes from a revert commit in master branch

Earlier I merged my feature branch in master which had a lot of commits and merging to master, created a merge commit in the master. Later on, due to some issues, we had to revert the changes and this was done in another commit which says reverting…
Amit
  • 30,756
  • 6
  • 57
  • 88
0
votes
1 answer

git-cherry seems like not working for disordered merges

I tried to use git cherry-pick for merging some commits from master and then git-cherry to determine what commits currently merged. It works fine while I merge it in the order it's on master, but when I skip merging one of the commits it doesn't…
Soid
  • 2,585
  • 1
  • 30
  • 42
0
votes
1 answer

Git merge-edit between branches, compared to Perforce

When I used Perforce, I did a compare between branches to see what CL was not merged. I used: p4 interchanges //depot/branches/$from_branch/... //depot/branches/$to_branch/... It recognized it perfectly, even if there was a merge-edit (a merge and…
OkyDokyman
  • 3,786
  • 7
  • 38
  • 50
0
votes
1 answer

Git cherry-picking remote commit from upstream, in a branch that isn't master

I have the following situation which is different than this one. Here's my local repo: $ git branch branch1 ... branchk master * this-branch-where-fix-should-happen What I want is to apply a commit that only exists in the upstream:staging…
Aristu
  • 761
  • 3
  • 17
  • 30
0
votes
0 answers

git cherry-pick not applying all modifications of a commit

I have a commit with more than 14 files modified. When I apply this commit in an other branch, the commit applied doesn't contain all these files but only 3 files. The commands i'm using are: git checkout mybranch git cherry-pick COMMIT_HASH Could…
Hinde
  • 69
  • 1
  • 2
  • 8
0
votes
1 answer

Rebase acts differently as expected

Following situation: two branches, upstream-dev and personal-dev, which vary a lot due to not yet merged or rejected features. I then create a new feature branch on personal-dev. I do some commits, testing etc. At the end, I want to rebase the…
MPW
  • 161
  • 1
  • 3
  • 16
0
votes
1 answer

How to pick commits from another git repository, and keep or record the original hashes

With reference to this thread: Is it possible to cherry-pick a commit from another git repository? .. and this answer provided in there (which is what I need): $ git --git-dir=..//.git \ format-patch -k -1 --stdout | …
v01d
  • 189
  • 1
  • 12
0
votes
1 answer

Git cherry-pick to integration branch and then revert the original commit from feature branch

What would be the consequences of reverting the original commit while the same had been cherry-picked to the target branch? There is a branch (say feature) with some changes (commit: A), while this change was expected to be in another branch (say…
Satyendra
  • 1,635
  • 3
  • 19
  • 33
0
votes
1 answer

Git cherry pick issue while picking a range of commits

Git version 1.7.1 - CentOS 6.6 I am trying to cherry pick a range of commits. I am in my feature branch and the output of git log is like below commit: 111 Author: abc time: xyz commit: 222 Author: abc time: xyz commit: 333 Author: abc time:…
Bala Krishnan
  • 374
  • 3
  • 18
0
votes
1 answer

Find Git cherry pick parent

I have done a cherry-pick from branch PRIVATE to branch MASTER. Done without -x (since done from GUI). It created a commit with conflict. Resolved and committed. I want to see in the future that this commit is a cherry-pick from branch PRIVATE to…
OkyDokyman
  • 3,786
  • 7
  • 38
  • 50
0
votes
1 answer

svn - How to commit changes "in between two revisions"?

The question: How do I commit changes "in between two revisions"? I'm using quotation marks because obviosly you cannot really commit anything between two revisions - they already are in repository. The long story, i.e. why do I need this? The…
TimoM
  • 53
  • 8
0
votes
1 answer

how to spell git revision range with single endpoint

I was lookin for range based on single commit to be able to do a cherry-pick In manual for gitrevisions I'm reading ^-, e.g. HEAD^-, HEAD^-2 Equivalent to ^.., with = 1 if not given. But I cant use it. Any…
tworec
  • 4,409
  • 2
  • 29
  • 34
0
votes
2 answers

GitHub: Bring a file into a separate repo

I need a specific file from an online repo brought into the local clone of my current project. I'd also like the file in a specific directory in the current project. I don't want to go the easiest route (copy the file from the clone); I'd rather…
DataZombies
  • 416
  • 6
  • 19
1 2 3
…
29 30