PhpStorm 8.0.0 Web Help

File | Settings | Version Control | Git


Use this page to specify the version control settings to be applied to the directories of your project that are under Git control.

Item Description
Path to Git executable In this text box, specify the path to the Git executable file. Type the path manually or click the Browse button browseButton and specify the path in the dialog that opens.
Test Click this button to verify the path to the Git executable file.
SSH executable Use this drop-down list to specify the SSH version to be used with Git. The available options are:
  • Built-in: select this option to use the implementation provided by PhpStorm.
  • Native: select this option to use native implementation.

    Warning

    On some platforms, the use of native ssh implementation may cause hang-up issues. You may need to configure a platform-specific ssh-askpass to receive prompts for passwords.

8.1+ Commit automatically on cherry-pick When you cherry pick a specific commit, the Commit Changes dialog is displayed. If the Commit automatically on cherry-pick option is selected, the selected commit is submitted silently on clicking the cherry-pick button cherryPickButton, without displaying the Commit Changes dialog.
Auto-update if push of the current branch was rejected Select this checkbox if you want the current branch to be updated automatically if the push operation from the current branch to its tracked branch is rejected.

If this option is deselected, PhpStorm will display the Push Rejected dialog when pushing a branch is rejected because your local repository and the remote storage are not synchronized.

Note

Note the following:

  • If you have never seen the Push Rejected dialog box before and you are enabling the check box initially, PhpStorm will update the conflicting local branch silently by means of the merge operation.
  • If you have already encountered the Push Rejected dialog box and selected the Remember the update method choice... option, PhpStorm saves your last choice (rebase ormerge) and will apply it to update the conflicting local branch silently.

    Accordingly, to change the "remembered" setting, clear the check box, access the Push Rejected dialog box, select the Auto-update if push ... rejected option, and invoke another update strategy.

Warn if CRLF line separators are about to be committed Select this option to enable smart handling of LF and CRLF line separators. PhpStorm will analyze your configuration, warn you if you are about to commit CRLF into the repository, and suggest changing the core.autocrlf setting to true or input depending on your operating system.

Note

Note that this setting is not applied to files where you have set any related Git attributes. In this case, PhpStorm assumes that you clearly understand what you are doing and excludes such files from analysis.

If this option is deselected, you will have to fix issues with line endings manually using the Difference Viewer dialog.

8.1+ Warn when committing in detached HEAD or during rebase Select this option if you want PhpStorm to display a warning when a commit is performed from a detached head or on rebase, as this may cause issues and code loss.
8.1+ Allow force push If this check box is selected, the Force push option is added to the Git Push dialog (as a drop-down option on the Push button).
Protected branches If you have selected the Allow force push option, but want to disable it for certain branches, list them here (this is a team-shared parameter that is stored in .idea/vcs.xml).

See Also

Concepts:

Procedures:

Reference:

Web Resources: