I don't think squashing is a good idea. Feature branches are good for keeping half baked work away from release ready branch. But feature-branch + merge is good enough for that. History is kept for a reason, disturbing it, even within a feature kills detailed information about why things are the way they are.
Atleast personally, I never felt any pain because of merge commits. I find it all the more useful because it gives out exactly how commits were formed, what has been tried, what bugs have been fixed, which patch broke something etc. Can we please keep the tree as is? -- Regards, Janmejay PS: Please blame the typos in this mail on my phone's uncivilized soft keyboard sporting it's not-so-smart-assist technology. On Nov 7, 2014 3:05 AM, "Michael Biebl" <mbi...@gmail.com> wrote: > 2014-11-06 14:02 GMT+01:00 Thomas D. <whi...@whissi.de>: > > What's my problem: > > > > Reading a commit log like > > > > - Merge branch 'v8-stable' > > - Merge branch 'v8-stable' > > - Merge branch 'v7-stable' into v8-stable > > - Merge branch 'v8-stable' > > - Merge branch 'v8-stable' > > - Merge branch 'v8-stable' > > - Merge branch 'master' of https://github.com/rsyslog/rsyslog > > - Merge branch 'v8-stable' > > - Merge branch 'v8-stable' > > - Merge branch 'v7-stable' > > - Merge branch 'v8-stable' > > > > is not very helpful. Nobody understands what's going on. > > > Wouldn't git log --no-merges solve your problem? > _______________________________________________ > rsyslog mailing list > http://lists.adiscon.net/mailman/listinfo/rsyslog > http://www.rsyslog.com/professional-services/ > What's up with rsyslog? Follow https://twitter.com/rgerhards > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you > DON'T LIKE THAT. > _______________________________________________ rsyslog mailing list http://lists.adiscon.net/mailman/listinfo/rsyslog http://www.rsyslog.com/professional-services/ What's up with rsyslog? Follow https://twitter.com/rgerhards NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE THAT.
