Create Patch Dialog
VCS | Create Patch
View | Tool Windows | Version Control - Local Changes - Context menu of a file or changelist - Create Patch
Use this dialog box to generate a patch file for the specified changelist or files, and to create a patch from the selected changelist or files.
This dialog box consists of several areas:
Modified files pane
This section contains a list of files that were modified since the last commit. All files in this list are selected by default. Deselect the check-boxes next to the files that you want to exclude from the patch.
Tooltip and Shortcut
Click this button to open the Differences dialog box that highlights the differences between your local working copy of the selected file and its repository version.
Click this button to reload the Changed files tree view so it is up-to-date.
Show Unversioned Files
Click this button if you want to see newly added files that have not been added to version control yet under the Unversioned Files node.
Add to VCS
Click this button to move the files selected under the Unversioned Files node to the active changelist, so that they are added to your version control system during the commit.
Move to Another Changelist
Click this button to add the selected file(s) to another changelist. The Move to Another Changelist dialog box opens where you can select an existing changelist or create a new one.
Click this button to delete the selected file.
Click this button to leave the selected files unversioned.
Click this button to revert all changes made to the local working copy of the selected files.
Jump to source
Click this button to open the source code of the selected file in the editor.
Revert Unchanged Files
Click this button to revert the files that have not been modified locally.
Group by Directory
Click this button to toggle between the flat view and the directory tree view.
Expand or collapse all nodes
Click these buttons to expand or collapse all nodes in the directory tree. These buttons are not available in flat view.
From this drop-down list, select the changelist that contains the modified files to be checked in or included in the patch. The active changelist is selected by default.
The summary under the modified files pane shows statistics on the currently selected changelist, such as the number of modified, new and deleted files. This area also shows how many files of each type are shown, and how many of them will be included in the patch.
Commit Message pane
The comment you enter in this area will be used as the name of the patch file.
You can click to choose from the list of recent commit messages.
The Details pane is hidden by default. To unfold it, click the arrow button next to the pane title.
In this pane you can explore the differences between the base repository version of the selected file, and the version you want to include in the patch.
Tooltip and Shortcut
Previous Difference / Next Difference Shift+F7 F7
|Use these buttons to jump to the next/previous difference. |
When the last/first difference is hit, PhpStorm suggests to click the arrow buttons F7/Shift+F7 once more and compare other files, depending on the Go to the next file after reaching last change option in the Differences Viewer settings.
This behavior is supported only when the Differences Viewer is invoked from the Version Control tool window.
Compare Previous/Next File
|Click these buttons to compare the local copy of the previous/next file with its update from the server.|
Jump to Source
Click this button to open the selected file in the active pane in the editor. The caret will be placed in the same position as in the Differences Viewer.
| Use this drop-down list to choose the desired viewer type. The side-by-side viewer has two panels; the unified viewer has one panel only. |
Both types of viewers enable you to
|Use this drop-down list to define how the differences viewer should treat white spaces in the text. |
|Select the way differences granularity is highlighted. |
The available options are:
Collapse unchanged fragments
Click this button to collapse all unchanged fragments in both files. The amount of non-collapsible unchanged lines is configurable in the Diff & Merge settings page.
Click this button to scroll both differences panes simultaneously. If this button is released, each pane can be scrolled independently.
Click this button to enable editing of the local copy of the selected file, which is disabled by default. When editing is enabled, you can make last-minute changes to the modified file before committing it.
Click this button to open a drop-down list of available options. Select or clear these options to show or hide line numbers, indentation guides, white spaces, and soft wraps.
Show diff in external tool
|Click this button to invoke an external differences viewer, specified in the External Diff Tools settings page. |
This button only appears on the toolbar when the Use external diff tool option is enabled in the External Diff Tools settings page.
Click this button to show the corresponding help page.
Note that the options listed above are available for text files only. PhpStorm cannot compare binary files, so most commands will be unavailable for them.
After you've selected the files you want to commit, click the Create Patch button and specify the patch file options in the dialog that opens.