How to create a patch for a single (or selected) file?

Question

I cannot seem to find a way to create a patch (or diff) for a subset of files for a commit.

Environment:

* Sourcetree 2.6.3 (134) for Mac (OS X Sierra)
* Git repository on BitBucket

Scenario:

* Large commit containing many changes
* In History View, I right click on the most recent commit and select "Create Patch..."
* Patch window appears.  In the history pane of the patch window I select the version I want to generate the diff (patch) from
* In the files window (lower left of the patch window) I select only the files for which I want to view
* This works for VIEWING the diffs (it only shows the diffs for the selected files) but when I click "Create" to create the patch file, the patch shows ALL files that have changed

How do I create a patch (diff) file for only the selected files?

Ni Bu · Answer

As far as I know, this feature is still not implemented in the latest sourcetree version.

But, actually, what you want is possible when creating a patch file from your working copy changes. So there is a workaround by performing the following steps:

* You checkout the commit that is one commit ahead of your desired commit
* You Cherry Pick your changes from the desired commit (uncheck the check box "Commit immediately upon successful merge". No you have "load" the commit into your working copy.
* You click on Actions->Create Patch...
* You click on "Working Copy Changes"
* You can now select all files that should be included into the patch file

Step 1 may not be needed in every case, but may be helpful to avoid a lot of merge conflicts and to make sure that all changes of the desired commit are included in the patch file.

Edoardo Molinatti · Answer

Hi Manju, how can it be done if the changes are not committed?
Should the file(s) be staged first?

Manju · Answer

I'm afraid there isn't an option to create patch per file or for individual files in commits. This is possible only if the changes are not committed.

Feel free to submit an enhancement request on jira.atlassian.com for the Sourcetree team to consider this feature in a future release.

Thanks,
Manjunath
Sourcetree Mac Developer