On Mon, Jan 25, 2016 at 3:11 PM Dawid Weiss <[email protected]> wrote:
> > commit 51396b8cf63fd7c77d005d10803ae953acfe659f > > Merge: 5319ca6 6df206a > > > > The 'merged' commit, in this case, seems redundant to me as it doesn't > add > > any useful information about them. > > It tells you exactly which two parent commits this merge actually > joins. In terms of patches -- this tells you which two different > "lines" of patches this commit consolidates. This isn't unimportant > information. > > Depends on the change, who you are, and what you care about. It's a discussion that's already been had 100000 times on the internet. We won't break any new ground here. Most of the other Apache projects go for linear history and rebase (eg see the Hadoop projects https://wiki.apache.org/hadoop/HowToCommit). Other projects don't. It's simply a religious decision. - Mark -- - Mark about.me/markrmiller
