How to save commits and branches in git?

Question

git

I want to move from simple commits to dev, and sometimes separate branches, followed by a commit to master, to something more. Gitflow immediately comes to mind. But it is not a silver bullet and many use something else.
But the main thing is that in master [and dev] there should not be a bunch of commits like fix-1, fix-in-last-minute-before-leave-from-work and so on. Probably, either fixes for the issue, or one big "resulting" commit should go to the main branches.
Next, should the spent branches be preserved? If not, then it may turn out to be a situation where it would be nice to see the history of changes by commits, but it is not there, there is only the result of all of them ...
In general, what should be done in 2018?

Answer 1

You need to do it in a way that is convenient for your team, project, development and deployment processes.
And to avoid fix-1 and other crap, it’s enough just to give understandable names to commits.

Answer 2

https://habr.com/post/183646/
https://habr.com/company/Voximplant/blog/276695/