I propose adding an additional option for continuation line indent:
1. "Not at All"
2. "With Spaces"
3. "Regular Indent"
The "Fixed" indent would indent all continuation lines by one indent, relative to the current level:
With this scheme, continuation lines are visually distinct, but their alignment does not change if "my_function" or "other_function" is renamed. Currently, continuation lines are aligned with the end of the previous entry:
This can cause trivial merge conflicts if one branch renames the function, and another renames only an argument.