[Vm-dev] git and branch JMM/SleepTime

[Jakob Reschke]

...or if you wanted to pick most of the changes from a commit or
branch, but reject individual files:

   git cherry-pick <commit> --no-commit
   - or -
   git merge <branch> --no-commit

then (probably after git status):

   git checkout HEAD -- <list of paths>

to discard the changes to these files. Then git commit to store your
partial merge/cherry-pick.

2017-03-23 0:07 GMT+01:00 Jakob Reschke <jakob.reschke at student.hpi.de>:
> You can cherry-pick whole commits with git cherry-pick.
>
> If you only want some files or a directory from a specific commit, use
>
>    git checkout <commit or branch> -- <list of file paths>
>
> then git add and git commit them as usual.
>
> 2017-03-22 23:59 GMT+01:00 Eliot Miranda <eliot.miranda at gmail.com>:
>>