git merge branch

I use git as my favorite revision control and my backup system. I also like to use git branches a lot, because it is possible to easy perform experimental changes to code with them. Whenever a small new feature is ready to be imported into the master, there is always that nasty commit history. It usually contains some messages that are … well … like “this stupid fcking thing does’t work” … “revert that sht” and stuff like that.

I don’t want to have these messages within my master branch, but i want to have one commit message that describes my new feature. The necessary steps for doing this are