Modifying local history is not dangerous, so I think mq is good. Never really used histedit and rebase.