Why not keep commits as the atomic element and use (release) tags if you want a coarse overview what happened?