From: Markus Heidelberg <markus.heidelberg@web.de>
To: David Aguilar <davvid@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH v2] contrib: add 'git-difftool' for launching common diff tools
Date: Mon, 19 Jan 2009 05:45:32 +0100 [thread overview]
Message-ID: <200901190545.33141.markus.heidelberg@web.de> (raw)
In-Reply-To: <1232324753-16137-1-git-send-email-davvid@gmail.com>
David Aguilar, 19.01.2009:
> 'git-difftool' is a git command that allows you to compare and edit files
> between revisions using common merge tools. 'git-difftool' does what
> 'git-mergetool' does but its use is for non-merge situations such as
> when preparing commits or comparing changes against the index.
> It uses the same configuration variables as 'git-mergetool' and
> provides the same command-line interface as 'git-diff'.
>
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
>
> This newer version addresses the feedback from Markus Heidelberg.
> difftool is now more consistent with mergetool and it includes
> Markus's vimdiff enhancements for positioning the cursor at startup.
Your patch is already in master, you should send a patch against it.
Markus
next prev parent reply other threads:[~2009-01-19 4:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-16 8:00 [PATCH] contrib: add 'git difftool' for launching common merge tools David Aguilar
2009-01-18 19:25 ` Markus Heidelberg
2009-01-19 0:25 ` [PATCH v2] contrib: add 'git-difftool' for launching common diff tools David Aguilar
2009-01-19 4:45 ` Markus Heidelberg [this message]
2009-01-19 0:34 ` [PATCH] contrib: add 'git difftool' for launching common merge tools David Aguilar
2009-01-19 5:03 ` Markus Heidelberg
2009-01-19 5:32 ` David Aguilar
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=200901190545.33141.markus.heidelberg@web.de \
--to=markus.heidelberg@web.de \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.