Re: [PATCH v2] pull: pass --signoff/--no-signoff to "git merge"

2017-10-12 Thread Junio C Hamano
"W. Trevor King" writes: > e379fdf3 (merge: refuse to create too cool a merge by default, > 2016-03-18) gave a reason for *not* passing options from pull to > merge: > > ...because such a "two project merge" would be done after fetching > the other project into some

Re: [PATCH v2] pull: pass --signoff/--no-signoff to "git merge"

2017-10-12 Thread W. Trevor King
On Thu, Oct 12, 2017 at 01:46:39AM -0700, W. Trevor King wrote: > The order of options in merge-options.txt isn't clear to me, but > I've put --signoff between --log and --stat as somewhat alphabetized > and having an "add to the commit message" function like --log. The order of options in

[PATCH v2] pull: pass --signoff/--no-signoff to "git merge"

2017-10-12 Thread W. Trevor King
e379fdf3 (merge: refuse to create too cool a merge by default, 2016-03-18) gave a reason for *not* passing options from pull to merge: ...because such a "two project merge" would be done after fetching the other project into some location in the working tree of an existing project and