How to edit Git “add patch” hunks/diffs/lines during selective staging?

Question

I have a source file where 2 features have been added. In order to allow cherry-picking, I\'d like to commit that in 2 phases: one for each feature. Until now, in similar si

Answer 1

There are Git GUIs that will let you select individual lines that you want to stage, allowing you to split lines that you normally wouldn't be able to using the regular git add --patch from the command line.

Two such GUIs are:

1. SourceTree.
2. Git Cola.