Allow squash merging on master

[joshblum]

I think this feature is useful for landing large features to keep the git history clean

[dicato]

@joshblum what's your thought on rebasing prior to merging? It puts the task on the submitter, for better or worse.

[joshblum]

I think GitHub allows you to click "update branch" and then you can merge the rebased version El El mar, jul 5, 2016 a las 12:16, Stephen DiCato notifications@github.com escribió:

@joshblum https://github.com/joshblum what's your thought on rebasing prior to merging? It puts the task on the submitter, for better or worse.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/macropin/django-registration/issues/200#issuecomment-230526485, or mute the thread https://github.com/notifications/unsubscribe/ABF01BR0NskreP9b8xglrZ2m9-NR9eODks5qSoNZgaJpZM4JFR1I .

[joshblum]

Also protecting the master branch is a good idea (on the same settings area) El El mar, jul 5, 2016 a las 12:18, Josh Blum jblum18@gmail.com escribió:

I think GitHub allows you to click "update branch" and then you can merge the rebased version El El mar, jul 5, 2016 a las 12:16, Stephen DiCato < notifications@github.com> escribió:

@joshblum https://github.com/joshblum what's your thought on rebasing prior to merging? It puts the task on the submitter, for better or worse.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/macropin/django-registration/issues/200#issuecomment-230526485, or mute the thread https://github.com/notifications/unsubscribe/ABF01BR0NskreP9b8xglrZ2m9-NR9eODks5qSoNZgaJpZM4JFR1I .

[timgraham]

We do squash merging on Django itself. For any pull requests that do use multiple commits and don't want squashing, we merge those using the command line.

[dicato]

👍 @macropin will have to configure this.

[macropin]

It's already enabled.

[joshblum]

Oh, can we disable merge commits then?