From: David Aguilar <davvid@gmail.com>
To: Sebastian Pipping <webmaster@hartwork.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Add diffuse as merge and diff tool
Date: Sun, 29 Mar 2009 21:55:23 -0700 [thread overview]
Message-ID: <20090330045522.GA8308@gmail.com> (raw)
In-Reply-To: <49CEA3E2.9020805@hartwork.org>
Hi
On 0, Sebastian Pipping <webmaster@hartwork.org> wrote:
>
> From e54c153a67cef9b162eb51f4b7cefb65e59c3a13 Mon Sep 17 00:00:00 2001
> From: Sebastian Pipping <sebastian@pipping.org>
> Date: Thu, 26 Mar 2009 20:42:31 +0100
> Subject: [PATCH] Add diffuse as merge and diff tool
>
> ---
> Documentation/git-mergetool.txt | 3 ++-
> Documentation/merge-config.txt | 7 ++++---
> contrib/completion/git-completion.bash | 3 ++-
> contrib/difftool/git-difftool-helper | 12 ++++++++----
> contrib/difftool/git-difftool.txt | 4 ++--
> git-gui/lib/mergetool.tcl | 7 +++++++
> git-mergetool.sh | 15 ++++++++++++---
> 7 files changed, 37 insertions(+), 14 deletions(-)
Hey, thanks for the patch.
Ouch.. too many places with duplicated information, huh?
I'm in the middle of refactoring git-(diff|merge)tool so that
there is less duplication of code.
Junio also has a number of difftool-related patches in his
proposed-updates "pu" branch.
Sebastian, would you mind if I rebased your patch on top of my
work (once I send it out) so that it makes things easier on
our kind maintainer? I have a big patch series coming down that
does away with the redundancies so I think it'd be best if we
transfered your changes on top of it. Would you mind if I
rebased your patch and sent it out to the list?
It wouldn't be until much later tonight (or tomorrow) at the
earliest since I have some unpacking to take care of but if
that's cool with you just let me know.
You should see the refactoring patches from me shortly...
--
David
next prev parent reply other threads:[~2009-03-30 4:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-28 22:25 [PATCH] Add diffuse as merge and diff tool Sebastian Pipping
2009-03-30 4:55 ` David Aguilar [this message]
2009-03-30 16:41 ` Sebastian Pipping
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=20090330045522.GA8308@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=webmaster@hartwork.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).