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

Re: Question on merge and mergetool settings

From
Markus Heidelberg <markus.heidelberg@web.de>
Date
Apr 29, 2009, 20:00 UTC
Message-ID
<200904292200.11373.markus.heidelberg@web.de>
In-Reply-To
<450196A1AAAE4B42A00A8B27A59278E70AE3F2FE@EXCHANGE.trad.tradestation.com>
John Dlugosz, 29.04.2009:
> In my config files which I inherited from someone else, there is an
> entry for "url" as well as for "path" under [merge] et al.
What is "et al." in this case? [mergetool]?
> I can't find that mentioned in the git-config manual.  Is that really
> used?
No.

There is remote.<name>.url, mergetool.<name>.path There is no merge.url, merge.path, mergetool.<name>.url

Markus
Previous: John DlugoszNext: John Dlugosz
Message 2 of 4 in “Question on merge and mergetool settings”
  1. John DlugoszApr 29, 2009
  2. Markus HeidelbergApr 29, 2009
  3. John DlugoszApr 29, 2009
  4. Markus HeidelbergApr 29, 2009

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.