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

Re: [PATCH] Add Code Compare v2.80.4 as a merge / diff tool for Windows

From
David Aguilar <davvid@gmail.com>
Date
Aug 10, 2012, 04:39 UTC
Message-ID
<CAJDDKr7uHXajcy-jLrg7PToh6cFH3wVYvuX8E7_tq+s2n+b+LA@mail.gmail.com>
In-Reply-To
<CAHGBnuPT+ULpPtO_QxqUY8qxfbRT==fACQdM+TG2CyhbcKM-_w@mail.gmail.com>

On Thu, Aug 9, 2012 at 9:22 AM, Sebastian Schuberth <sschuberth@gmail.com> wrote:

Show 23 quoted lines
> On Thu, Aug 9, 2012 at 6:03 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
>>> I still agree that not listing all mergetools in multiple places is a
>>> good thing. But doing the whole stuff of extending --tool-help for
>>> git-mergetool and git-difftool to return a simple list that can be
>>> used in git-completion.bash etc. IMHO is a separate topic and out of
>>> scope of this patch.
>>
>> Exactly.  If you know that is the long term direction, I would have
>> preferred you _not_ to touch any existing descriptions of the tools
>> (not even changing them to refer to "--tool-help") in this patch, in
>> order to avoid unnecessary conflicts with the topic of unifying the
>> list of tool backends, which can be written and cooked separately.
>
> To the the best of my knowledge there currently no such topic
> underway, and even if it was, it would be unclear how long it would
> take for integration. If I was not touching the existing descriptions
> of the tools, and a Git version was to be released after accepting my
> patch but before the --tool-help topic is merged, that would leave the
> documentation in a wrong state. I was just trying to be consistent by
> also touching the descriptions, which IMHO is the correct thing to do
> in the short term, as you yourself say the topic to make use of
> --tool-help is a long term goal.
Thanks Sebastian.
I think your patch would be good, so long as we leave the descriptions alone.

If you could please re-roll to add the new scriptlet without touching the docs then that would be very helpful.

I have a separate patch to update the mergetool documentation for --tool-help which I will send shortly.

I have another topic (--symlinks) in next upon which it is based.
-- 
David
Previous: Sebastian SchuberthNext: Sebastian Schuberth
Message 6 of 7 in “Add Code Compare v2.80.4 as a merge / diff tool for Windows”
  1. Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth, Aug 8, 2012
  2. Junio C HamanoAug 8, 2012
  3. Sebastian SchuberthAug 9, 2012
  4. Junio C HamanoAug 9, 2012
  5. Sebastian SchuberthAug 9, 2012
  6. David AguilarAug 10, 2012
  7. Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth, Aug 10, 2012

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.