Git

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.

MPS supports Git from the Windows Subsystem for Linux 2 (WSL2), which is available in Windows 10 version 2004.

If Git is not installed on Windows, MPS searches for Git in WSL and uses it from there. Also, MPS automatically switches to Git from WSL for projects that are opened when you use the \\wsl$ path.

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.

Enable this option if you are more used to the concept of staging changes for commit instead of using changelists where modified files are staged automatically.

Using the staging area allows you to easily commit changes to the same file separately (including overlapping changes), and see which changes are already staged without switching focus from the editor. For details, see Use the Git staging area to commit changes.

note

If you enable the staging area, all existing changelists will be deleted.

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

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.

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.

• 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.

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.

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.