{"thread":{"id":"19124","subject":"Question on merge and mergetool settings","startedAt":"2009-04-29T16:25:48Z","lastAt":"2009-04-29T21:36:53Z","messageCount":4,"participants":["John Dlugosz","Markus Heidelberg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"112649","messageId":"450196A1AAAE4B42A00A8B27A59278E70AE3F2FE@EXCHANGE.trad.tradestation.com","threadId":"19124","inReplyTo":null,"subject":"Question on merge and mergetool settings","fromName":"John Dlugosz","fromEmail":"jdlugosz@tradestation.com","sentAt":"2009-04-29T16:25:48Z","receivedAt":"2009-04-29T16:25:48Z","isPatch":false,"sender":{"key":"jdlugosz@tradestation.com","avatar":null},"body":"In my config files which I inherited from someone else, there is an\nentry for \"url\" as well as for \"path\" under [merge] et al.\n\nI can't find that mentioned in the git-config manual.  Is that really\nused?\n\n--John\n\nTradeStation 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.\n  If you received this in error, please contact the sender and delete the material from any computer.\n"},{"id":"112678","messageId":"200904292200.11373.markus.heidelberg@web.de","threadId":"19124","inReplyTo":"450196A1AAAE4B42A00A8B27A59278E70AE3F2FE@EXCHANGE.trad.tradestation.com","subject":"Re: Question on merge and mergetool settings","fromName":"Markus Heidelberg","fromEmail":"markus.heidelberg@web.de","sentAt":"2009-04-29T20:00:11Z","receivedAt":"2009-04-29T20:00:11Z","isPatch":false,"sender":{"key":"markus.heidelberg@web.de","avatar":"https://avatars.githubusercontent.com/u/6334512?v=4"},"body":"John Dlugosz, 29.04.2009:\n> In my config files which I inherited from someone else, there is an\n> entry for \"url\" as well as for \"path\" under [merge] et al.\n\nWhat is \"et al.\" in this case? [mergetool]?\n\n> I can't find that mentioned in the git-config manual.  Is that really\n> used?\n\nNo.\n\nThere is remote.<name>.url, mergetool.<name>.path\nThere is no merge.url, merge.path, mergetool.<name>.url\n\nMarkus\n"},{"id":"112692","messageId":"450196A1AAAE4B42A00A8B27A59278E70B002E12@EXCHANGE.trad.tradestation.com","threadId":"19124","inReplyTo":"200904292200.11373.markus.heidelberg@web.de","subject":"RE: Question on merge and mergetool settings","fromName":"John Dlugosz","fromEmail":"jdlugosz@tradestation.com","sentAt":"2009-04-29T21:17:07Z","receivedAt":"2009-04-29T21:17:07Z","isPatch":false,"sender":{"key":"jdlugosz@tradestation.com","avatar":null},"body":"> No.\n> \n> There is remote.<name>.url, mergetool.<name>.path\n> There is no merge.url, merge.path, mergetool.<name>.url\n> \n\nCan the git-config document be relied on to be complete and up to date?\nAny tool can simply claim any variables it likes.  I tried sifting\nthrough the source code, but it's not easy to identify a complete set.\n\n--John\n\n\n\nTradeStation 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.\n  If you received this in error, please contact the sender and delete the material from any computer.\n"},{"id":"112697","messageId":"200904292336.54256.markus.heidelberg@web.de","threadId":"19124","inReplyTo":"450196A1AAAE4B42A00A8B27A59278E70B002E12@EXCHANGE.trad.tradestation.com","subject":"Re: Question on merge and mergetool settings","fromName":"Markus Heidelberg","fromEmail":"markus.heidelberg@web.de","sentAt":"2009-04-29T21:36:53Z","receivedAt":"2009-04-29T21:36:53Z","isPatch":false,"sender":{"key":"markus.heidelberg@web.de","avatar":"https://avatars.githubusercontent.com/u/6334512?v=4"},"body":"John Dlugosz, 29.04.2009:\n> > There is remote.<name>.url, mergetool.<name>.path\n> > There is no merge.url, merge.path, mergetool.<name>.url\n> \n> Can the git-config document be relied on to be complete and up to date?\n\nThat would be rather unrealistic, but I think it's pretty good. The\nabove mentioned config options for example are included there :)\nThe options in the sendemail.* namespace for another example are only\nmentioned in the git-send-email doc.\n\nMarkus\n"}]}