I'm trying to merge master branch to my feature branch using IntelliJ IDEA's UI option. VCS -> Git -> Merge Changes....
I select the checkbox No commit and select the origin/master branch to merge.
However, after doing this and I run git log I see that a new commit was created with the merged changes.
The same happens if I use the Terminal window in IntelliJ by running
git merge origin/master --no-commit.
When I do this in Git Bash it works correctly (the commit is not created).
Is there any known issue related to this problem with IntelliJ?
My IntelliJ IDEA version is: 2017.1.1 (build 171.4073.35)