PhpStorm 6.0.1 Web Help

VCS | Git | Rebase

The dialog box opens when you click OK in the Rebase branches dialog box, with the Interactive check box selected.

Use this dialog box to define the order of applying commits, squash or edit commits before applying, and skip commits that contain extraneous changes.

ItemDescription
ActionUse this drop-down list to define the action to apply to the selected commit. The available options are:
  • Pick - select this option to apply the commit as is.
  • Edit - select this option to update the commit before applying it.
  • Skip - select this option to ignore the commit.
  • Squash - select this option to combine the commit with the previous commit.
CommitThis read-only field displays the hash of the selected commit.
CommentThis read-only field shows the comment supplied for the selected commit.
ViewClick this button to view the files affected in the selected commit.
Move Up/Move DownUse these buttons to change the order in which commits should be applied.

See Also

Concepts:

Procedures:

Reference:

Web Resources: