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

Question on merge and mergetool settings

From
JDJohn Dlugosz <jdlugosz@tradestation.com>
Date
Apr 29, 2009, 16:25 UTC
Message-ID
<450196A1AAAE4B42A00A8B27A59278E70AE3F2FE@EXCHANGE.trad.tradestation.com>

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.

I can't find that mentioned in the git-config manual. Is that really used?

--John
TradeStation Group, Inc. is a publicly-traded holding company (NASDAQ GS: TRAD) of three operating subsidiaries, TradeStation Securities, Inc. (Member NYSE, FINRA, SIPC and NFA), TradeStation Technologies, Inc., a trading software and subscription company, and TradeStation Europe Limited, a United Kingdom, FSA-authorized introducing brokerage firm. None of these companies provides trading or investment advice, recommendations or endorsements of any kind. The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited.
  If you received this in error, please contact the sender and delete the material from any computer.
Next: Markus Heidelberg
Message 1 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.