Initial commit of my new feature. Lunch time
The new feature is done!
Fix bug in new feature
Merge branch 'newfeature'
Remove part of the old feature and remove the rest
Merge branch 'anotherfeature' with nice one commit trail