Git

File | Settings | Version Control | Git for Windows and Linux

MPS | Preferences | Version Control | Git for macOS Ctrl+Alt+S

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

Item	Description
Path to Git executable	In this field, specify the path to the Git executable file. Type the path or click Browse and specify the path in the dialog that opens.
Test	Click this button to verify the path to the Git executable file.
Set this path only for current project	Select this option if you want to use different paths for different projects, and don't want this setting to be applied globally.
Execute branch operations on all roots	This option only becomes available if you have a multirooted project, that is there are several Git repositories within a single project. Select this option if you want branch operations (such as `checkout`, `merge`, and so on.) to be applied synchronously to all repositories within your project.
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 , without displaying the Commit Changes dialog.
Add the 'cherry-picked from <hash>' suffix when picking commits pushed to protected branches	Select this option if you want to keep a reference to the original commit when cherry-picking a commit from a protected branch. By default, no suffix is added when cherry-picking a change.
Warn if CRLF line separators are about to be committed	Select this option to enable smart handling of `LF` and `CRLF` line separators. MPS 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 that this setting is not applied to files where you have set any related Git attributes. In this case, MPS 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.
Warn when committing in detached HEAD or during rebase	Select this option if you want MPS to display a warning when a commit is performed from a detached head or on rebase, as this may cause issues and code loss.
Explicitly check for incoming commits on remotes	If this option is enabled, MPS will check if there are pending incoming commits that have not been fetched to your local repository, and will mark such branches in the Branches popup. Select how you want to MPS to query the remote to check for incoming commits: Auto: MPS will check for updates in the background if HTTP or Git protocol is used to access the remote. If SSH is used, this check will not be performed so that external authentication applications don't popup unexpectedly. Always: MPS will check for updates in the background even if SSH is used to access the remote. Never: MPS will not query the remote for incoming commits, and a warning will be displayed in the Branches popup, allowing you to run the check manually.
Update method	Use this list to choose the strategy to synchronize your local repository with the remote storage. The selected method will be used when the `push` operation is rejected (if the Auto-updated if push of the current branch was rejected option is enabled), or when you invoke the Update Project operation.
Clean working tree using	Select how you want uncommitted changes to be treated when you perform a project update: Stash: local changes will be saved to a git stash. This is useful if you need to apply patches with stashed changes outside MPS, as they are generated by Git itself. Shelve: MPS will put local changes to a shelf. Shelving is done by MPS, and patches generated from shelved changes are normally applied inside MPS.
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, MPS will display the Push Rejected dialog when pushing a branch is rejected because your local repository and the remote storage are not synchronized. Note the following: If you have never seen the Push Rejected dialog before and you are enabling the checkbox initially, MPS will update the conflicting local branch silently by means of the `merge` operation. If you have already encountered the Push Rejected dialog and selected the Remember the update method choice... option, MPS 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 checkbox, access the Push Rejected dialog, select the Auto-update if push ... rejected option, and invoke another update strategy.
Show Push dialog for Commit and Push	Select this option if you want the Push dialog to be displayed after you've clicked Commit and Push in the Commit Changes dialog. Otherwise, your changes will be pushed automatically to the affected repository.
Show Push dialog only when committing to protected branches	Select this option if you only want to show the Push Changes dialog if you are pushing to a protected branch when you've clicked Commit and Push in the Commit Changes dialog. Otherwise, your changes will be pushed automatically to the affected repository.
Protected branches	If you want to disable the ability to force push changes for certain branches, list them here (this is a team-shared parameter that is stored in .idea/vcs.xml). You can list several branches separated by a semicolon, or supply branch patterns as the input is treated as a list of regular expressions.
Use credential helper	Select this option if you don't want to override credential helpers, which is the default behavior. You will be able to authenticate using a credential helper in the Git login dialog.
Filter Update Project information by paths	If you don't want to get information on all changes to a project in the Update Info tab when you perform an update, you can filter the list by specific paths.

Last modified: 18 June 2020