I actually recommend using a tag for the tip of a discarded branch whose history you want to keep rather than keeping the branch around. I tend to only keep branches for live heads of development. At least when I remember to clean things up. Just thoughts; I don't have significant stakes in this game.