From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jacob Nisnevich <jacob.nisnevich@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH 0/2] mergetools: add support for ExamDiff
Date: Sat, 2 Apr 2016 14:02:39 -0700 [thread overview]
Message-ID: <20160402210239.GA6917@gmail.com> (raw)
In-Reply-To: <xmqqfuv5i4i7.fsf@gitster.mtv.corp.google.com>
On Fri, Apr 01, 2016 at 11:10:56AM -0700, Junio C Hamano wrote:
> Jacob Nisnevich <jacob.nisnevich@gmail.com> writes:
>
> > OK I add the quotes and modified the comment. I also changed $folder to
> > $sub_directory. I think that makes a little bit more sense and sounds a lot
> > better.
> >
> > Jacob Nisnevich (2):
> > mergetools: create mergetool_find_win32_cmd() helper function for
> > winmerge
> > mergetools: add support for ExamDiff
> >
> > git-mergetool--lib.sh | 25 +++++++++++++++++++++++++
> > mergetools/examdiff | 18 ++++++++++++++++++
> > mergetools/winmerge | 21 +--------------------
> > 3 files changed, 44 insertions(+), 20 deletions(-)
> > create mode 100644 mergetools/examdiff
>
> This round looked good to me.
> David, does this look sensible to you?
>
> Thanks.
Yes, thank you.
Acked-by: David Aguilar <davvid@gmail.com>
cheers,
--
David
next prev parent reply other threads:[~2016-04-02 21:02 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
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 [this message]
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=20160402210239.GA6917@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.