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
1
vote
1 answer

Git cherry-pick old commit

I just encountered the following scenario: Some commits in a branch [develop] (multiple people working on it) were causing issues and I wanted to copy them to a separate branch [feature1] so they could be fixed/added to (and the code removed from…
timhc22
  • 7,213
  • 8
  • 48
  • 66
1
vote
1 answer

GIT: how to commit in two branches using cherry-pick

I have one local commit (for example, at branch1 branch) and I need to apply it to another branch (eg. branch2). I know that I have to use the git cherry-pick command but I really cant find out by myself how the command should finally look. Help…
SeniorJD
  • 6,946
  • 4
  • 36
  • 53
1
vote
2 answers

Why can't I push the changes if I've cherry-picked

I'm trying to remove two last commits via rebase/cherry-pick. After invoking git rebase HEAD^^^ -i I'm leaving only necessary commit (leaving everything up to HEAD^^, so I'm dropping HEAD^ and HEAD). After the git push I see the following: !…
igorp1024
  • 1,103
  • 2
  • 12
  • 19
1
vote
1 answer

Why git gives priority to a cherry-pick commit over the revert commit?

Assume that I have a following tree: $ git log --graph --oneline --decorate --all * 7b261e3 (HEAD, master) Revert "A" * 32f08ae A | * f0b008f (b) A |/ * 83c0052 init $ git log -p --graph --decorate --all * commit…
ernix
  • 3,442
  • 1
  • 17
  • 23
1
vote
1 answer

Git branch with ff merges from master - remove ff merges

I have this situation in our codebase. We created a branch but, mistakingly, we merged master into that a few times (which resulted in a few fast forward merges). Now we have a mix of commits done in the branch and code merged at some point during…
Roberto
  • 1,450
  • 1
  • 15
  • 32
1
vote
1 answer

Cherry-pick changesets between different repos

I have two mercurial repositories, generic and specific, which is a clone of the first repo: $ hg glog -R generic @ changeset: 0:d516ded3bf0a summary: generic project commit $ hg glog -R specific @ changeset: 3:5f7b2efea94b | …
Paolo
  • 20,112
  • 21
  • 72
  • 113
1
vote
0 answers

Git cherry-pick, github branch comparisons and SHA ids, oh my

I have a question about cherry-pick. We have a project with two main branches: deploy and develop (that's a simplified but accurate view). Deploy is what we have deployed to our production servers and develop is what we're working on (with feature…
grahamb
  • 887
  • 3
  • 7
  • 22
1
vote
3 answers

Hotfixing in git

Say I have two branches in Git: development and qa-test. Both of these branches contain different features - commits but also A is the latest common ancestor of these two branches: A--->B--->C--->developent \ \ D--->E--->qa-test Now in some…
Narek
  • 38,779
  • 79
  • 233
  • 389
1
vote
1 answer

more verbose git cherry

I'm looking for git cherry to behave more like git log. I have two independent branches in my git repository (result of svn import). No common ancestor, no merges between them. I don't want these two branches to be ever connected, even though they…
pawrog
  • 108
  • 8
1
vote
1 answer

Problems with reseting the git cherry-pick

I made some code adjustments to evaluate some functionality in our software. This changes were made to a version of software let say dev_1. We have the official version of the software in CVS, so I checked out dev_1, initiated a git repo and made a…
jlanik
  • 859
  • 5
  • 12
1
vote
1 answer

Git: how to push changes made to only certain files?

I recently ran into a problem where I need to select a few files to push to remote branches with git. My specific use case here is there is only one file created/modified in every single commit, and I need to programatically push the selected files…
Xavier_Ex
  • 8,432
  • 11
  • 39
  • 55
1
vote
1 answer

How to partial reintegrate a branch to trunk?

I searched a lot about this topic but did not found a convincing answer. I have a branch B that is used for Feature F1, F2 and F3. Commits for the features a mixed (e.g. a commit for F1, commit for F2, commit for F1). Feature F1 is now finished…
wierob
  • 4,299
  • 1
  • 26
  • 27
1
vote
1 answer

Git is duplicating code

We just switched from Subversion to Git. The problem that came up this morning was that we cherry-picked a commit from a branch into master so maser would have a bug fix. Then we merged master back to the branch. When we tried to compile, all of…
James Baker
  • 67
  • 1
  • 8
1
vote
1 answer

Add repo as your remote and cherry pick

How to add this repo as a remote and cherry pick the incremental patches. https://github.com/adridu59/semc-7x30-kernel-ics/commits/master-V2?page=6 I need update kernel for android only from this repo (not from other sites) cd…
user1902729
  • 11
  • 1
  • 2
1
vote
1 answer

Apply commit to multiple release branches - Git Rebase or Cherry-Pick?

I am working on a project with a Master branch, of course :P and multiple release branches created over time. The version control I'm using is Git and I was looking for a way to apply bug fixes (for example) made in one release branch to the others,…
marked
  • 589
  • 9
  • 24
1 2 3
…
29 30