My team also uses feature branches, with a squashed merge commit. They used the argument that it's easy to revert that commit. But I didn't want to lose the de

My team also uses feature branches, with a squashed merge commit. They used the argument that it's easy to revert that commit. But I didn't want to lose the detailed history either, so our squash commit message contains the complete list of squashed messages, and we keep the old feature branch alive forever on a separate remote.