lkml.org 
[lkml]   [2013]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: unneeded merge in the security tree
Date
Theodore Ts'o <tytso@mit.edu> writes:

> On Tue, Mar 12, 2013 at 02:30:04PM -0700, Junio C Hamano wrote:
>> Theodore Ts'o <tytso@mit.edu> writes:
>>
>> > [remote "origin"]
>> > url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
>> > fetch = +refs/heads/master:refs/heads/master
>> > mergeoptions = --ff-only
>> >
>>
>> Is there an escape hatch for that rare case? IOW, how does a
>> submaintainer who configured the above to override --ff-only?
>
> Hmm, maybe we would need to add a --no-ff-only? Or they could just
> do:
>
> git fetch origin
> git merge FETCH_HEAD

Hmm, neither feel quite nice.

I haven't heard any comments on my alternative proposal, by the
way. Did the message get lost?


\
 
 \ /
  Last update: 2013-03-13 04:42    [W:2.372 / U:0.696 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site