By default, no suffix is added when cherry-picking a change.Ĭlick to configure GPG Key for signing your commits or to select an existing key. Select this option if you want to keep a reference to the original commit when cherry-picking a commit from a protected branch. 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.Īdd the 'cherry-picked from ' suffix when picking commits pushed to protected branches Warn when committing in detached HEAD or during rebase If this option is deselected, you will have to fix issues with line endings manually using the Difference Viewer dialog. In this case, PhpStorm assumes that you clearly understand what you are doing and excludes such files from analysis. This setting is not applied to files where you have set any related Git attributes. PhpStorm will analyze your configuration, warn you if you are about to commit CRLF into the repository, and suggest changing the tocrlf setting to true or input depending on your operating system. Select this option to enable smart handling of LF and CRLF line separators. Warn if CRLF line separators are about to be committed If you enable the staging area, all existing changelists will be deleted. For details, see Use the Git staging area to commit changes. 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. 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.
0 kommentar(er)
