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

Re: [PATCH v2] contrib: add 'git-difftool' for launching common diff tools

From
Markus Heidelberg <markus.heidelberg@web.de>
Date
Jan 19, 2009, 04:45 UTC
Message-ID
<200901190545.33141.markus.heidelberg@web.de>
In-Reply-To
<1232324753-16137-1-git-send-email-davvid@gmail.com>
David Aguilar, 19.01.2009:
Show 13 quoted lines
> '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
Previous: David AguilarNext: David Aguilar
Message 4 of 7 in “contrib: add 'git difftool' for launching common merge tools”
  1. contrib: add 'git difftool' for launching common merge toolsDavid Aguilar, Jan 16, 2009
  2. Markus HeidelbergJan 18, 2009
  3. contrib: add 'git-difftool' for launching common diff toolsDavid Aguilar, Jan 19, 2009
  4. Markus HeidelbergJan 19, 2009
  5. David AguilarJan 19, 2009
  6. Markus HeidelbergJan 19, 2009
  7. David AguilarJan 19, 2009

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.