Tentatively improve step-through git alias
Tentatively improve step-through git alias

Now handles the --rebase-merges flag so branches with merges in don't
cause trouble.

SevereOverfl0w/.files,SevereOverfl0w/.files,SevereOverfl0w/.files