C. Bergström posted on Mon, 15 Sep 2014 02:49:48 +0700 as excerpted: > Pretty please do NOT allow "merge" commits.. they are the bane of evil > for the long term ability to have any sane work-flow. Trying browsing a > commit history after a big merge commit.. or following the parent..
You just called the inventor of git and the workflow it was designed to manage insane. If that's the case arguably quite a bit more insanity would be a good thing! =:^) Try git log --color --stat --graph on the mainline kernel in a terminal and read only the main merge-commit logs unless that merge is something of special interest you want more info on. It actually makes following a full kernel cycle, including the commit window, drilling down to sub- merges and individual commits only on 2-3 areas of interest while keeping a general awareness of developments in the rest of the kernel not only practical once again, but relatively easy. Without seeing merge-commits it was a LOT harder. I know as I've done it both ways, and while I can get around in git to some extent, my git skills are definitely nothing special! =:^) -- Duncan - List replies preferred. No HTML msgs. "Every nonfree program has a lord, a master -- and if you use the program, he is your master." Richard Stallman
