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

Re: [PATCH/RFC v4 3/3] git-am: add am.threeWay config variable

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Jun 4, 2015, 15:11 UTC
Message-ID
<vpqeglrik3w.fsf@anie.imag.fr>
In-Reply-To
<1433430295-10805-3-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr>
Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> writes:
Show 12 quoted lines
> @@ -90,10 +90,13 @@ default.   You can use `--no-utf8` to override this.
>  
>  -3::
>  --3way::
> +--no-3way::
>  	When the patch does not apply cleanly, fall back on
>  	3-way merge if the patch records the identity of blobs
>  	it is supposed to apply to and we have those blobs
> -	available locally.
> +	available locally. `--no-3way` can be used to override
> +	am.threeWay configuration variable. For more information,
> +	see am.threeWay in git-config(1).
... in linkgit:git-config[1].
-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Remi Lespinet
Message 4 of 4 in “git-am.sh: fix initialization of the threeway variable”
  1. 1/3 git-am.sh: fix initialization of the threeway variableRemi Lespinet, Jun 4, 2015
  2. 2/3 t4150-am: refactor am -3 testsRemi Lespinet, Jun 4, 2015
  3. 3/3 git-am: add am.threeWay config variableRemi Lespinet, Jun 4, 2015
  4. Matthieu MoyJun 4, 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.