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

Re: When are you going to stop ignoring pull.mode?

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Jul 17, 2021, 17:53 UTC
Message-ID
<60f3190eaba81_25f220843@natae.notmuch>
In-Reply-To
<c015e599-0178-cc3d-11be-175dc917f2b9@gmail.com>
Bagas Sanjaya wrote:
Show 7 quoted lines
> On 17/07/21 02.14, Felipe Contreras wrote:
> > The solution is simple and self-documenting:
> > 
> >    pull.mode={fast-forward,merge,rebase}
> > 
> 
> But how about config transition from pull.{ff,rebase} to pull.mode?

I have already discussed how the transition would look like, and it's pretty straightforward [1].

Additionally I already implemented the patch that does the mapping [2].

[1] https://lore.kernel.org/git/5fd8b1d5d4d7c_190cd7208b@natae.notmuch/ [2] https://lore.kernel.org/git/20210705123209.1808663-27-felipe.contreras@gmail.com/

-- 
Felipe Contreras
Previous: Bagas SanjayaNext: Matthias Baumgarten
Message 3 of 10 in “When are you going to stop ignoring pull.mode?”
  1. Felipe ContrerasJul 16, 2021
  2. Bagas SanjayaJul 17, 2021
  3. Felipe ContrerasJul 17, 2021
  4. Matthias BaumgartenJul 17, 2021
  5. Felipe ContrerasJul 17, 2021
  6. Junio C HamanoJul 17, 2021
  7. Felipe ContrerasJul 17, 2021
  8. Matthias BaumgartenJul 19, 2021
  9. Junio C HamanoJul 19, 2021
  10. Felipe ContrerasJul 19, 2021

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.