Use patches

In the Local Changes view, select the file or changelist that you want to include in the 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 the 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.

In the Log tab of the Git tool window Alt+9, locate the commit with the changes you want to include in the patch 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 necessary file in any view (the Project tool window, the editor, the Changes view, and so on).

Select Git | Selected File | Show History from the main menu or Git | Show History 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 Git | 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 the base directory to a single file, directory, or selection.

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

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

Select the changelist to which you want to apply the patch or specify the name of a new changelist in the Name field, and enter a comment to this changelist (optionally).

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

If you want Aqua to save the context of a task associated with the new changelist when deactivated and restore the context when the changelist becomes active, select the Track context option.

If you want to move the patch to a temporary storage (shelf) before applying it, click Import to shelf (for more information, refer to Shelve or stash changes). Otherwise, click OK.