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

Re: [PATCH] git-am: add am.threeWay config variable

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Aug 18, 2015, 09:36 UTC
Message-ID
<vpqfv3h9bvf.fsf@anie.imag.fr>
In-Reply-To
<1438697966-4958-1-git-send-email-pyokagan@gmail.com>
Paul Tan <pyokagan@gmail.com> writes:
Show 12 quoted lines
> From: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
>
> Add the am.threeWay configuration variable to use the -3 or --3way
> option of git am by default. When am.threeway is set and not desired
> for a specific git am command, the --no-3way option can be used to
> override it.
>
> Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
> Signed-off-by: Paul Tan <pyokagan@gmail.com>
> ---
> I tweaked Remi's patch so it is implemented on top of builtin/am.c. Hopefully
> there will be no regressions this time ;)
Thanks for doing this.

I don't remember the details of the regression we had with the shell version, but that would probably deserve an additional test to enforce the "Hopefully there will be no regressions" part of your message.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Johannes SchindelinNext: Paul Tan
Message 3 of 5 in “git-am: add am.threeWay config variable”
  1. git-am: add am.threeWay config variablePaul Tan, Aug 4, 2015
  2. Johannes SchindelinAug 7, 2015
  3. Matthieu MoyAug 18, 2015
  4. Paul TanAug 19, 2015
  5. Matthieu MoyAug 19, 2015

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.