I\'m currently in the midst of a git rebase --interactive session, where I\'m editing a commit. I\'m proceeding as suggested by How can I split up a Git commit bur
I have another answer that seems to be more fool-proof, though undocumented.
$ git reset HEAD^
$ git add ... # stage the first part of your split
$ git commit -m 'part one'
$ git commit -a -F $(git rev-parse --git-dir)/rebase-merge/message