git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: linux-next: unneeded merge in the security tree

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 13, 2013, 03:17 UTC
Message-ID
<7v38w056pk.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20130313023026.GD16919@thunk.org>
Theodore Ts'o <tytso@mit.edu> writes:
Show 17 quoted lines
> 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?

Previous: Theodore Ts'o
Message 12 of 12 in “Re: linux-next: unneeded merge in the security tree”
  1. Linus TorvaldsMar 12, 2013
  2. Geert UytterhoevenMar 12, 2013
  3. Junio C HamanoMar 12, 2013
  4. Junio C HamanoMar 12, 2013
  5. Theodore Ts'oMar 12, 2013
  6. Linus TorvaldsMar 12, 2013
  7. Junio C HamanoMar 12, 2013
  8. Linus TorvaldsMar 12, 2013
  9. Junio C HamanoMar 12, 2013
  10. Junio C HamanoMar 12, 2013
  11. Theodore Ts'oMar 13, 2013
  12. Junio C HamanoMar 13, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.