PyCharm git commit split code block change

Question

Is there a way in PyCharm/IntelliJ to split a block of code-changes into multiple parts, so I can commit only parts of it and if so, how?

I.e. in the example I can only tick the checkbox on line 222 and get the entire code-block in my changeset. What I'd like is to only add line 223 to the commit, but not line 224.

Answer 1

The 2023.2 update of PyCharm introduces this feature (I'm running build #PY-232.8660.197, built on July 26, 2023).

You should be able to include only specific lines within a codeblock from now on: