Patch Set 1:

A agree having too many options at once may be a problem. We could hidet them as some do with an Advanced option than opens up only when asked for.

I also dislike going into a dialog doing some work and then figure I have to cancel and go to another dialog, especially when I lose work, i.e. my so-far-written commit message and the staging done so far.