lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ryan Ernst <>
Subject Re: Git Policy/Preference: how to fold in feature branches? squash?
Date Fri, 25 Mar 2016 17:07:29 GMT
On Fri, Mar 25, 2016 at 9:59 AM, Chris Hostetter <>

> It may only create a single commit, but from the perspective of people
> viewing master, it "adds" every commit that was on the jira/SOLR-445
> branch to the master branch -- generating an metric ass-ton of
> emails among other things, but more importantly it pollutes history
> with a lot of intermediate crap

It doesn't pollute history, it *is* history. If you want to only view the
history of the "main line" of development (ie each merge is just the single
merge commit), then use --first-parent in your log command.

View raw message