title: Tool to apply only some changes in Git
body: <p>Say I have two files &quot;version 1.py&quot; and &quot;version 3.py&quot;. I want to have a version in between &quot;version 2.py&quot; because for example, I made two changes (e.g. feature A and bugfix 1) and I don't want to commit both changes simultaneously, as that isn't considered good practice. What I did is, I had the diff open on one side of the screen and manually copied the changes I want into the Pycharm-IDE. So what is the workflow in this case? There should be a tool to do that, shouldn't it? I didn't found one. I would take any tool I find and is advanced enough, I would however prefer a way to do that in Pycharm or Git. I found emacs with patch files, however emacs doesn't take the original file so it don't know when you're trying to change the source file. That resulted in me corrupting the patch and then the patch not being accepted by git.</p>