All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: David Aguilar <davvid@gmail.com>
Cc: Jacob Nisnevich <jacob.nisnevich@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH] mergetools: implemented new mergetool file for ExamDiff
Date: Thu, 24 Mar 2016 08:43:58 -0700	[thread overview]
Message-ID: <xmqq60wbc24h.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160324074404.GA30574@gmail.com> (David Aguilar's message of "Thu, 24 Mar 2016 00:44:04 -0700")

David Aguilar <davvid@gmail.com> writes:

> We can probably do this without introducing a new file.  One
> possible home for this is with the rest of the "default"
> definitions of the functions in git-mergetool--lib.sh's
> setup_tool() function.
>
> But, that hints that we expect tools to override it.
>
> A better place would be as a normal function inside
> git-mergetool--lib.sh, which more strongly hints that we do not
> expect tools to override mergetool_find_win32_cmd().

Thanks for a clearly described set of rules that people can easily
follow.

  reply	other threads:[~2016-03-24 15:44 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-20  4:58 [PATCH] mergetools: created new mergetool file for ExamDiff Jacob Nisnevich
2016-03-21  1:02 ` Junio C Hamano
2016-03-21  3:32   ` David Aguilar
2016-03-23  0:43     ` [PATCH 0/2] Helper function for ExamDiff and Winmerge mergetools Jacob Nisnevich
2016-03-23  0:43       ` [PATCH 1/2] mergetools: created new mergetool file for ExamDiff Jacob Nisnevich
2016-03-23  0:43       ` [PATCH 2/2] created helper function for both winmerge and examdiff mergetools Jacob Nisnevich
2016-03-23  2:41         ` Junio C Hamano
2016-03-23 22:55           ` [PATCH] mergetools: implemented new mergetool file for ExamDiff Jacob Nisnevich
2016-03-23 22:55             ` Jacob Nisnevich
2016-03-24  7:44               ` David Aguilar
2016-03-24 15:43                 ` Junio C Hamano [this message]
2016-03-25 22:52                   ` [PATCH 0/2] add support " Jacob Nisnevich
2016-03-25 22:52                     ` [PATCH 1/2] mergetools: create mergetool_find_win32_cmd() helper function for winmerge Jacob Nisnevich
2016-03-25 23:00                       ` Junio C Hamano
2016-03-25 23:17                         ` [PATCH 0/2] mergetools: add support for ExamDiff Jacob Nisnevich
2016-03-25 23:17                           ` [PATCH 1/2] mergetools: create mergetool_find_win32_cmd() helper function for winmerge Jacob Nisnevich
2016-03-25 23:17                           ` [PATCH 2/2] mergetools: add support for ExamDiff Jacob Nisnevich
2016-04-01 18:10                           ` [PATCH 0/2] " Junio C Hamano
2016-04-02 21:02                             ` David Aguilar
2016-03-25 22:52                     ` [PATCH 2/2] " Jacob Nisnevich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq60wbc24h.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jacob.nisnevich@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.