Stack Overflow
Stack Overflow

Questions tagged [git-cherry-pick]

This command applies the changes introduced by some existing commits.

Given one or more existing commits, apply the change each one introduces, recording a new commit for each. This requires your working tree to be clean (no modifications from the HEAD commit).

When it is not obvious how to apply a change, the following happens:

  • The current branch and HEAD pointer stay at the last commit successfully made.

  • The CHERRY_PICK_HEAD ref is set to point at the commit that introduced the change that is difficult to apply.

  • Paths in which the change applied cleanly are updated both in the index file and in your working tree.

  • For conflicting paths, the index file records up to three versions, as described in the "TRUE MERGE" section of git-merge(1). The working tree files will include a description of the conflict bracketed by the usual conflict markers <<<<<<< and >>>>>>>.

  • No other modifications are made.

See git-merge for some hints on resolving such conflicts.

Links

376 questions
0
votes
2 answers

How to delete a commit with a password from BitBucket git repository history?

I have accidentally committed a password to a BitBucket git repository some time ago, several commits behind the current master. While I removed the password later by committing without it, it still exists in several past commits. I don't mind…
Aqo
  • 343
  • 4
  • 16
0
votes
1 answer

Undoing some merges/commits, but keeping some

I have a bad merge, followed by a couple of good commits. I tried to revert the bad merge, however I do not want to loose these changes (i.e. I do not want a further commit, which undoes the changes), I just dont want them in my branch. So my log…
devklick
  • 2,000
  • 3
  • 30
  • 47
0
votes
1 answer

Finding cherry-picked or rebased commits using hash of the original commit

I have a large git repo with many branches (normally, I work only with a small subset of them, related to features owned by my team). Suppose I have a hash of a commit (e.g. copied from a pull request). This commit might have been merged into one of…
Vladimir Reshetnikov
  • 11,750
  • 4
  • 30
  • 51
0
votes
1 answer

Clarification with how GitHub's pull request works and merging in general. What must be done?

Recently, we've been merging topic branches to our development branches. Here's the thing: right after a topic branch has been merged to development branch (thru a pull request), a new change needs to be introduced to that topic branch to fix some…
Valkyrurr
  • 119
  • 1
  • 12
0
votes
1 answer

Splitting a 'mixed' dirty branch into multiple clean branches

I had a bad git workflow for a while -- I made changes regarding both subject A, subject B and subject C in the same dirtybranch, and in fact also in intermixed commits. I want to clear this up, so that I have a clean branchA, branchB and branchC…
jonaslb
  • 179
  • 9
0
votes
0 answers

Incorrect branch differences in TFS

We see incorrect branch differences in TFS (git repository). We follow a typical scenario between dev and release branch: Create a "release" branch from current "dev" and deploy it for testing. Fix a few bugs within "release" branch. Each bug is…
Dmitry Korolev
  • 31
  • 5
0
votes
3 answers

Move an misplaced commit to a new branch

Setup: I have commited a code change to local and also to remote, but in the wrong branch. My solution: Have checked out master and created a branch where the code change should be Cherry-picked the commit from the wrong branch checkin and…
Jerker Pihl
  • 125
  • 1
  • 13
0
votes
1 answer

How to share a fix between previous releases and current work in the cycle workflow?

I am wondering which route should I take, a cherry-pick or something else? I have this branching tree: ReleaseX ^ / Master --> ReleaseY | V WorkInProgress | | V V FeatureX FeatureY ..…
Sandra K
  • 1,209
  • 1
  • 10
  • 21
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

What does "git cherry-pick origin/master" mean?

What does git cherry-pick origin/master mean? How does this instruction work? When updating current local master branch from remote (i.e., fetch data from remote and merge with local files), we could use the following options: git pull origin…
Cythilya
  • 99
  • 1
  • 9
0
votes
0 answers

git automation - setup local branch to receive commit from working branch, auto-add a file, commit with default message & push without checkouts

I have a fairly complex workflow. My working git branch is master. Assume that there exists a local branch called push_branch. I'd like to automate the following steps whilst staying from within my working branch master. At a particular point in…
Dr Krishnakumar Gopalakrishnan
  • 115
  • 7
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
1 answer

cherry-pick a merge conflict resolution

When two branches are merged and if there is conflict, after the conflict is resolved and committed, the change of this conflict resolution is recorded in the merge commit, as can be seen by git show. Now I need to cherry-pick just this conflict…
Anthony Wong
  • 101
  • 3
0
votes
2 answers

How does 'git cherry-pick' find the file(s) to apply the changes to?

I have two repositories with a similar structure, but no common commits. I've added them as remotes of each other to be able to cherry-pick commits between them. Recently, I've noticed that git correctly applies the commit's changes even if the…
Eugene Yarmash
  • 142,882
  • 41
  • 325
  • 378
0
votes
1 answer

Merge branch with cherry-picked commit from local branch without any conflict

When I cherry-pick commits from another branch, and then try to merge it. If more changed have been applied I have merge conflicts. A good example, is if I have follow the 'gitflow' cliché way of doing git (master, develop, feature/bugfix, hotfix).…
Antoine Catton
  • 380
  • 3
  • 16
1 2 3
…
25 26