Both merge and rebase, but no cherry-pick. Goodbye then, I guess.

I've seen a dozen of those tools wishing to "simplify" git and they all fail my workflow, which is pretty common I guess, team git with central server and source control.

What I use:

    git push with target

    git fetch

    git checkout

    git cherry-pick

    git reflog

    git log, status, diff obviously.