There are four ways of doing so: Clean way, reverting but keep in log the revert: git revert –strategy resolve <commit> Harsh way, remove altogether only the last commit: git reset –soft “HEAD^” Note: Avoid git reset –hard as it will also discard all changes in files since the last commit. If –soft does not … Read more
The way a cherry-pick works is by taking the diff a changeset represents (the difference between the working tree at that point and the working tree of its parent), and applying it to your current branch. So, if a commit has two or more parents, it also represents two or more diffs – which one … Read more
I’d do it with cherry-pick -n (–no-commit) which lets you inspect (and modify) the result before committing: git cherry-pick -n <commit> # unstage modifications you don’t want to keep, and remove the # modifications from the work tree as well. # this does work recursively! git checkout HEAD <path> # commit; the message will have … Read more
The answer, as given, is to use format-patch but since the question was how to cherry-pick from another folder, here is a piece of code to do just that: $ git –git-dir=../<some_other_repo>/.git \ format-patch -k -1 –stdout <commit SHA> | \ git am -3 -k Explanation from Cong Ma comment Aug 28 ’14 git format-patch … Read more
Git 1.7.2 introduced the ability to cherry pick a range of commits. From the release notes: git cherry-pick learned to pick a range of commits (e.g. cherry-pick A..B and cherry-pick –stdin), so did git revert; these do not support the nicer sequencing control rebase [-i] has, though. To cherry-pick all the commits from commit A … Read more
Cherry picking in Git means to choose a commit from one branch and apply it onto another. This is in contrast with other ways such as merge and rebase which normally apply many commits onto another branch. Make sure you are on the branch you want to apply the commit to. git switch master Execute … Read more