Use patches

In the Local Changes view, select the file or the changelist based on which you want to create a patch, and choose Create Patch from Local Changes from the context menu.

You can also select the changes for commit, click the arrow next to the Commit button and select Create Patch.

In the dialog that opens, make sure that all changes you want to include in the patch are selected, enter a commit comment (optionally) and click Create Patch.

In the Patch File Settings dialog, modify the default patch file location if necessary, and click OK.

Locate the commit that you want to create a patch from in the Log tab of the Version Control tool window Alt+9 and select Create Patch from the context menu.

In the Patch File Settings dialog, modify the default patch file location if necessary, and click OK.

Select the required file in any view (in the Project tool window, in the editor, in the Local Changes view, and so on).

Select Git | Show History from the main VCS menu or from the context menu of the selection. The History tab is added to the Git tool window showing the history for the selected file and allowing you to review and compare its revisions.

Right-click a revision and choose Create Patch from the context menu, or click the Create Patch icon on the toolbar.

Select VCS | Patch | Apply patch from the main menu.

In the Apply Patch dialog that opens, specify the path to the .patch file you want to apply.

If necessary, click and choose Map Base Directory to specify a directory relative to which file names in the patch file will be interpreted. You can map a base directory to a single file, directory, or to a selection.

If the source code was edited after a patch was created, conflicts may arise. To check if you patch can be applied without conflicts, click Show Diff Ctrl+D. If there are conflicts, the corresponding lines will be highlighted with red.

If you want to apply changes to files stored in different locations from those specified in the patch, you can strip off the leading directories by clicking and choosing Remove All Leading Directories.

Select an existing changelist where you want to add the patch from the list, or specify the name of a new changelist in the Name field, and, optionally, enter a comment to this changelist.

If you want to make this changelist active, select the Set active option.

If you want to move the patch to a temporary storage (shelf) before applying it, click Import to shelf (see Shelve and unshelve changes for details). Otherwise, click OK.