Theodore Ts'o <ty...@mit.edu> writes:
> On Tue, Mar 12, 2013 at 02:30:04PM -0700, Junio C Hamano wrote:
>> Theodore Ts'o <ty...@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
> 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?
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html