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

[PATCH/RFC v3 4/4] git-am: add am.threeWay config variable

From
Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Date
Jun 3, 2015, 16:43 UTC
Message-ID
<1224076916.87652.1433349788756.JavaMail.zimbra@ensimag.grenoble-inp.fr>
In-Reply-To
<vpqvbf4da95.fsf@anie.imag.fr>
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes
Show 6 quoted lines
> Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> writes:
> 
> > +am.threeWay::
> > +        By default, git-am will fail if the patch does not apply cleanly.
> 
> http://article.gmane.org/gmane.comp.version-control.git/270538
Ok sorry.
Thanks
Previous: Matthieu MoyNext: Junio C Hamano
Message 15 of 16 in “git-am.sh: fix initialization of the threeway variable”
  1. 1/4 git-am.sh: fix initialization of the threeway variableRemi Lespinet, Jun 2, 2015
  2. 2/4 git-am.txt: add configuration section in git am documentationRemi Lespinet, Jun 2, 2015
  3. Junio C HamanoJun 2, 2015
  4. Torsten BögershausenJun 3, 2015
  5. 2/4 git-am.txt: add configuration section in git am documentationRemi Lespinet, Jun 3, 2015
  6. Torsten BögershausenJun 4, 2015
  7. Matthieu MoyJun 3, 2015
  8. Junio C HamanoJun 3, 2015
  9. Remi LespinetJun 3, 2015
  10. Remi LespinetJun 4, 2015
  11. 3/4 t4150-am: refactor am -3 testsRemi Lespinet, Jun 2, 2015
  12. 4/4 git-am: add am.threeWay config variableRemi Lespinet, Jun 2, 2015
  13. Junio C HamanoJun 2, 2015
  14. Matthieu MoyJun 3, 2015
  15. 4/4 git-am: add am.threeWay config variableRemi Lespinet, Jun 3, 2015
  16. Junio C HamanoJun 2, 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.