Summary - Cherry-pick

Combine the cherry-pick flow to selectively move commits.

The selective commit move flow

Selective commit moving goes through three steps: you find the hash of the commit to move, go to the target branch, and apply it with git cherry-pick. If a conflict appears you fix the file, mark it with git add and finish with git cherry-pick --continue.

git log --oneline
a1b2c3d ozellik eklendi
7f0c411 temel kayit

git checkout -
git cherry-pick a1b2c3d

In this flow only the commit you chose is moved to the target branch.

Exercise Selective commit move

Create dosya.txt with v1 inside, add it and save quietly. On the ozellik branch set dosya.txt to v2 and create ek.txt with ek inside; save both files in one quiet commit and take its hash into the HASH variable. Go back to the previous branch and save dosya.txt with v3. Try to apply the HASH commit with git cherry-pick; resolve the conflict as v3, add the file again and finish with --continue. Print the contents of dosya.txt and ek.txt at the end.

Show example solution

git init -q
echo v1 > dosya.txt
git add dosya.txt
git commit -q -m "v1"
git checkout -q -b ozellik
echo v2 > dosya.txt
echo ek > ek.txt
git add dosya.txt ek.txt
git commit -q -m "degisiklikler"
HASH=$(git rev-parse HEAD)
echo uc > uc.txt
git add uc.txt
git commit -q -m "uc"
git checkout -q -
echo v3 > dosya.txt
git add dosya.txt
git commit -q -m "v3"
git cherry-pick $HASH >/dev/null 2>&1 || true
echo v3 > dosya.txt
git add dosya.txt
GIT_EDITOR=true git cherry-pick --continue >/dev/null 2>&1
cat dosya.txt
cat ek.txt

Test yourself

Which command moves only the commit you chose to the current branch?
- git stash pop
- git cherry-pick a1b2c3d
- git reset --hard
- git init
Show answer

git cherry-pick a1b2c3d — git cherry-pick applies the single commit you name by hash to the current branch; reset, stash and init do not do this job.

Put the hash in the command

git checkout -
git cherry-pick a1b2c3d____

Show answer

git checkout -
git cherry-pick a1b2c3da1b2c3d

Selective move flow

commit_hash

Selects the commit to move
git cherry-pick

Applies the chosen commit
conflict

A state waiting for a fix
git cherry-pick --continue

Continues after the fix

Next lesson: git revert

We Are Enhancing Your Experience

Cookie Preferences

Strictly Necessary Cookies

Analytical Cookies