git squash (sq) and merge-into (mi) commands to simplify using WIP branches