split determining of current branch from displaying of sanity check
use 'git cherry' correctly, oops
support interactive merge