| 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 
to open the Select Path - Git Configuration dialog box
and select the location of the Git executable file in the directories tree.
|
| Test | Click this button to check whether the specified settings ensure establishing connection. |
| 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 have the implementation provided by PhpStorm used.
- Native: select this option to have the native implementation used.
Warning
On some platforms, using the native ssh implementation may cause hang-up problems.
In native case, you may need to configure a platform-specific ssh-askpass
to receive prompts for passwords.
|
|
Auto-update if push of the current branch was rejected
|
-
Clear this check box to have PhpStorm display the Push Rejected dialog box when
pushing a branch to its tracked branch is rejected due to lack of synchronization between your local repository
and the remote storage. The dialog box proposes to synchronize the local branch using rebase
or merge.
-
Select this check box to have the current branch updated automatically if your push from the current branch to its tracked branch is rejected.
Note
-
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... check box,
PhpStorm saves your last choice (rebase or merge)
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 check box, whereupon invoke another update strategy.
|
|
Control branches from different roots synchronously
|
Select this check box to have PhpStorm apply commit, push, and other Git operations to several mutually connected repositories at once.
For details see the topic Git Branches in Multirooted Projects.
|
|
Warn if CRLF line separators are about to be committed
|
|
