Re: Request for git merge --signoff

2017-07-24 Thread Christian Couder
On Sat, Jul 1, 2017 at 5:24 PM, Dan Kohn wrote: > https://github.com/coreinfrastructure/best-practices-badge is a user > of the https://github.com/probot/dco bot which checks that commits > have a signoff. The issue is that there is no `--signoff` option in > git for merge commits, which is a stan

Re: Request for git merge --signoff

2017-07-01 Thread Ævar Arnfjörð Bjarmason
On Sat, Jul 01 2017, Dan Kohn jotted: > https://github.com/coreinfrastructure/best-practices-badge is a user > of the https://github.com/probot/dco bot which checks that commits > have a signoff. The issue is that there is no `--signoff` option in > git for merge commits. I think it's fine to ad

Re: Request for git merge --signoff

2017-07-01 Thread Junio C Hamano
Dan Kohn writes: > On Sat, Jul 1, 2017 at 1:45 PM, Junio C Hamano wrote: >> Dan Kohn writes: > >>> Could you please add a `--signoff` option to `git merge`? > >> The reason why we changed the default for "git merge" to start an >> editor at around v1.7.10 was because we wanted to encourage peop

Re: Request for git merge --signoff

2017-07-01 Thread Dan Kohn
On Sat, Jul 1, 2017 at 1:45 PM, Junio C Hamano wrote: > Dan Kohn writes: >> Could you please add a `--signoff` option to `git merge`? > The reason why we changed the default for "git merge" to start an > editor at around v1.7.10 was because we wanted to encourage people > to write log message t

Re: Request for git merge --signoff

2017-07-01 Thread Junio C Hamano
Dan Kohn writes: > This alternative workflow works, but is obviously tedious: > > ```sh > # First 3 steps are the same > (feature-branch)$ git merge origin/master > # Save default commit message > (feature-branch)$ git commit --amend -s > # Commit message now has signoff line > (feature-branch)$

Request for git merge --signoff

2017-07-01 Thread Dan Kohn
https://github.com/coreinfrastructure/best-practices-badge is a user of the https://github.com/probot/dco bot which checks that commits have a signoff. The issue is that there is no `--signoff` option in git for merge commits, which is a standard part of our workflow with feature branches. Here is