Thanks for the tips! MQ and bookmarks look like they could be a solid fill-in for Gits staging area and cheap branching. I'll definitely look more into them.