threads / discuss / 19124

Question on merge and mergetool settings

Subject: Question on merge and mergetool settings

## tl;dr

4 messages between Apr 29, 2009 and Apr 29, 2009.

replies: 3people: 2as markdown or json

John Dlugosz· Apr 29, 2009, 16:25 UTC · lore

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.

Markus Heidelberg· Apr 29, 2009, 20:00 UTC · re: John Dlugosz · lore

Re: Question on merge and mergetool settings

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

John Dlugosz· Apr 29, 2009, 21:17 UTC · re: Markus Heidelberg · lore

RE: Question on merge and mergetool settings

Show 5 quoted lines

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

Can the git-config document be relied on to be complete and up to date? Any tool can simply claim any variables it likes. I tried sifting through the source code, but it's not easy to identify a complete set.

--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.

Markus Heidelberg· Apr 29, 2009, 21:36 UTC · re: John Dlugosz · lore

Re: Question on merge and mergetool settings

John Dlugosz, 29.04.2009:

> > There is remote.<name>.url, mergetool.<name>.path
> > There is no merge.url, merge.path, mergetool.<name>.url
> 
> Can the git-config document be relied on to be complete and up to date?

That would be rather unrealistic, but I think it's pretty good. The above mentioned config options for example are included there :) The options in the sendemail.* namespace for another example are only mentioned in the git-send-email doc.

Markus