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

Re: [PATCH v7 1/1] pull: add ff-only option

From
Alex Henrie <alexhenrie24@gmail.com>
Date
Nov 23, 2020, 23:22 UTC
Message-ID
<CAMMLpeR8_fshsaqSF6idOY-KyFw2+AK_5683a-7wDXhsO=iFVQ@mail.gmail.com>
In-Reply-To
<CAMP44s2FRZUvUy+F3banxd9MEdL=RMqEdJL3JLYEGDQkOz3vNA@mail.gmail.com>

On Mon, Nov 23, 2020 at 3:46 PM Felipe Contreras <felipe.contreras@gmail.com> wrote:

Show 5 quoted lines
>
> This patch leaves everything in place to enable this new mode, but it
> only gets enabled if the user specifically configures it;
>
>   pull.rebase = ff-only.
Why not use the existing pull.ff=only option instead of adding a new one?
-Alex
Previous: Felipe ContrerasNext: Junio C Hamano
Message 4 of 11 in “Reject non-ff pulls by default”
  1. 0/1 Reject non-ff pulls by defaultFelipe Contreras, Nov 23, 2020
  2. 1/1 pull: add ff-only optionFelipe Contreras, Nov 23, 2020
  3. Felipe ContrerasNov 23, 2020
  4. Alex HenrieNov 23, 2020
  5. Junio C HamanoNov 23, 2020
  6. Felipe ContrerasNov 23, 2020
  7. Jeff KingNov 24, 2020
  8. Felipe ContrerasNov 24, 2020
  9. Raymond E. PascoNov 24, 2020
  10. Alex HenrieNov 24, 2020
  11. Felipe ContrerasNov 24, 2020

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.