4 ms·
Some people avoid merges like plague because they hate their commit history looking like a train station. Then you cherry pick and/or rebase.
by frant-hartm 7y ago
Some people avoid merges like plague because they hate their commit history looking like a train station. Then you cherry pick and/or rebase.
- frutiger 7y agoI never really understood this philosophy. Separating the graph structure from how you view it is the way to go I think. e.g. `git log --no-merges`.
- frant-hartm 7y agoWhy would I want my history to be a graph in the first place?
- totony 7y agoA graph can be flatten, but a sequence/line can't be expended. More information seems better than less
- kccqzy 7y agoI find that with `--first-parent`, my history looks reasonably linear, assuming the typical workflow of having each merge commit merging a topic branch into master.
- frant-hartm 7y agoYeah that works, if people are disciplined (no merge origin/master into master ...). You don't see individual commits from feature branches though.
- kccqzy 7y agoYes. And code review should enforce that kind of discipline. I am not generally interested in individual commits from feature branches though, but when I do I can easily reveal them when needed.