There\'re few question about \"flattening merge\" on StackOverflow, with an answer usually being \"git rebase\". These answers though miss one crucial point - order of commi
What is the problem with leaving seperate development in seperate lines up until they were merged? If they were seperate, then they were seperate.
There are many ways to view the history in chronological order without hacking the history as you're trying. Have you tried git log --pretty --date-order
?