> I would prefer to have a "fold/folder" of commits which could be manipulated as 'one commit'

You can get this, more or less, with the combination of using `git rebase` and `git merge --no-ff`.