Andreas Enge <[email protected]> writes:
I find git merges confusing; given that "git log" creates a
linear
representation, I find it difficult to picture the non-linear
history in the terminal (at some point in time, a colleague
showed
me an additional graphical tool to picture the two parallel
lines,
but I forgot what it was).
If you run `git log --graph', git will print a small ASCII diagram
on the left-hand side of the output representing the commit
parent/child relationships.
I strongly prefer a linear history, where possible. Many
extremely useful Git tools that deal with ranges of history (like
rebase and bisect) become very difficult to use when they have to
traverse histories with merge commits.
-- Ian
