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
votes
2 answers

If I create a pull request on a repository, if the admins decide to include only some of the commits, will that still count as a contribution for me?

I want to make a contribution to the Rails repository in a very specific file. That contribution should be split on various commits. If I create the pull request and say the admins decide than only some commits are good to merge, will they be able…
-1
votes
2 answers

How can I move a commit back to a location in history before a branch was merged while leaving the branch intact?

After merging a branch into master, I realized that I ideally should have made a minor commit before the branch was merged, because it is directly related to the commit before the merge. I have tried to clarify what the desired outcome looks like in…
joelostblom
  • 43,590
  • 17
  • 150
  • 159
-1
votes
1 answer

Is cherry-pick works from Master to Branch (Master commit --> Branch)?

I know cherry works from Branch to Master(Branch commit --> Master). But, Is cherry-pick works from Master to Branch (Master commit --> Branch)?
Narendra G
  • 491
  • 4
  • 9
-1
votes
1 answer

How to create a pull request for a particular commit

I am trying to create a pull request for a particular commit. I have already executed the following commands git push upstream issue-430 There is a particular commit that I want to create a pull request. I tried to create another branch from…
TriposG
  • 103
  • 1
  • 2
  • 11
-1
votes
1 answer

pushed code to gerrit after cherry-pick by mistake

My code is based on a cherry-pick I have done to another patch. I pushed it by mistake as the other patch is not ready yet. So in gerrit I see the other patch files as well. How do I make now my pushed patch re-based without the other files that…
-1
votes
1 answer

Git: Using cherry-pick to copy tags from one branch to another

I have a MASTER branch with several commits and tags. I would like to copy only the tags from MASTER into a RELEASE branch (and no other commits). I first created an empty MASTER branch, and committed it with message only. Then I created an empty…
rustcat
  • 1
  • 3
-1
votes
1 answer

How to add modification to a submitted change in Git?

I have pushed a change in Git with a little mistake. How to add some modification in that same changelist? I heard that it's possible using cherrypick. I'm unable to find how.
codedoc
  • 2,079
  • 2
  • 11
  • 15
-2
votes
1 answer

Official documentation describing the base used in the cherry-pick command

This answer to a previous question on StackOverflow suggests the base used for the cherry-pick command is the parent of the commit to be cherry-picked. It makes a lot of sense to me, but I wanted to possibly verify it using the official…
H D
  • 151
  • 6
-2
votes
1 answer

Clarification of Git cherry-pick command?

I have following Branches a) Master b) Master/Test-1 c) Master/Test-2 I have few commits on Master/Test-1 branch. I had cherry-pick on Master/Test-2 branch from above commit hash. if i delete Master/Test-1 branch. Is cherry-pick changes will…
-2
votes
1 answer

Can't cherry pick (error)

I'm trying to cherry-pick a commit from CyanogenMod Github and having issue, here's more info: Commit to cherry-pick: https://github.com/CyanogenMod/android_device_lge_bullhead/commit/4c98c8df392dfb305d7ffe5deaf9a2bdf7824037 Error occurring: error:…
Sid
  • 17
  • 1
  • 5
-3
votes
1 answer

git cherry-pick seems to picks up two commits from a single hash

The below screenshot shows the result of running git cherry-pick while on branch master. This operation is picking up two commits instead of a single commit. I don't understand why this is the case and wonder if this is a git bug. I am…
FreelanceConsultant
  • 13,167
  • 27
  • 115
  • 225
-3
votes
1 answer

How can I start a new branch with squashed commits from an open PR?

The problem: I have a PR with a tonne of commits. The branch name is also not accurate. I would like to start a new branch, and continue from the latest commit, without cherry picking each commit. I want all the work to be reduced to 1 commit that…
-3
votes
1 answer

Git Cherry-pick branching strategy?

So I joined a team that's recently (within the last year) moved from TFS to GIT. The branching strategy is this. Dev -> Release -> Master. When Dev is ready, merge to Release. Build from Release and deploy to various environments. Once it…
1 2 3
29
30