Skip to content

Instantly share code, notes, and snippets.

@mwrites
Created October 11, 2017 05:38
Show Gist options
  • Save mwrites/55b5a6ac15e2effd5b0af923682ff044 to your computer and use it in GitHub Desktop.
Save mwrites/55b5a6ac15e2effd5b0af923682ff044 to your computer and use it in GitHub Desktop.
cherry-pick single file

up vote 387 down vote accepted I'd do it with cherry-pick -n (--no-commit) which lets you inspect (and modify) the result before committing:

git cherry-pick -n

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

commit; the message will have been stored for you by cherry-pick

git commit If the vast majority of modifications are things you don't want, instead of checking out individual paths (the middle step), you could reset everything back, then add in what you want:

unstage everything

git reset HEAD

stage the modifications you do want

git add

make the work tree match the index

(do this from the top level of the repo)

git checkout .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment