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

Re: [PATCH/RFC v2 2/2] git-am: add am.threeWay config variable

From
Paul Tan <pyokagan@gmail.com>
Date
Jun 2, 2015, 14:37 UTC
Message-ID
<CACRoPnSZ77mOvqRn+PLauDyQtjU8gDvtUKPmUzLo6Hc4CE+RvQ@mail.gmail.com>
In-Reply-To
<vpqvbf6jko8.fsf@anie.imag.fr>
Hi,

On Tue, Jun 2, 2015 at 9:37 PM, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:

Show 12 quoted lines
> Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> writes:
>
>> +if test "$(git config --bool --get am.threeWay)" = true
>> +then
>> +    threeway=t
>> +fi
>
> I think you missed Paul's remark on this:
>
> http://article.gmane.org/gmane.comp.version-control.git/270150
>
> Not terribly important since am will be rewritten soon, though.

As the person who had to do four preparatory patch series' to fix bugs for the rewrite of git-pull, I respectfully disagree ;-)

Regards, Paul

Previous: Eric SunshineNext: Mikael Magnusson
Message 6 of 8 in “t4150-am: refactor am -3 tests”
  1. 1/2 t4150-am: refactor am -3 testsRemi Lespinet, Jun 2, 2015
  2. 2/2 git-am: add am.threeWay config variableRemi Lespinet, Jun 2, 2015
  3. Matthieu MoyJun 2, 2015
  4. 2/2 git-am: add am.threeWay config variableRemi LESPINET, Jun 2, 2015
  5. Eric SunshineJun 2, 2015
  6. Paul TanJun 2, 2015
  7. Mikael MagnussonJun 2, 2015
  8. Matthieu MoyJun 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.