On Tue, 18 Oct 2016 23:13:26 +0200 Patrice Clement <[email protected]> wrote: > In the case of Gentoo though, it makes no sense. We should strive for > keeping a clean and linear history.
A DAG is what I would call linear history :) Merge commits preserve that structure, git log performs a topological sort on the history DAG, effectively showing it to you as a timeline. Now, topsort is kind of classical, very efficient, algorithm so why should I care doing this sorting manually when git does it faster and better than I would ever do ? Also, if you want to see linear history, why do you use git log --graph ? This seems to me you're inventing your own problems :) > By avoiding merge commits, we make sure the history stay linear with > no parent/child commits all over the place. It leads us to the two > remaining solutions for dealing with PRs in a clean fashion: > cherry-picking and git am. These two solutions really shine at > keeping a sane history. git merge ... git rebase origin/master this kills the merge commit and reparents the commits you merged to the tip of origin/master
