On Tue, Jan 19, 2016 at 6:28 PM Gus Heck <gus.h...@gmail.com> wrote: > Will the process still involve a patch in Jira? In which case things are > effectively squashed anyway... > > Yes, patches in JIRA will still be the primary force, with our secondary GitHub integration hooks. Agreed, 3rd party submissions will get effectively squashed anyway.
This linear history topic was mainly meant for the few committers we have that have not really used Git. Committers will work within a repo, and even if they put up a patch, likely commit from that same work. Basically, we are agreeing to keep a merge commit out of places where it only adds confusion. Whether that is done via rebase or squash or some other git fu, we probably can't really mandate, nor do we need to. I trust that people that use Git are not going to go in and do tons of crazy stuff. We want the people that don't use Git to keep things sane as well. - Mark -- - Mark about.me/markrmiller
