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

git-{merge,diff}tool refactor round three

From
David Aguilar <davvid@gmail.com>
Date
Apr 6, 2009, 08:31 UTC
Message-ID
<1239006689-14695-1-git-send-email-davvid@gmail.com>
Hopefully this is the final round =)
This series is based on top of master.

The result of this series gets us to where da/difftool in pu arrived, but does so in a maintainer-friendly way.

I'm including Markus' patches in this series just so that it's clear that this series is dependent on it.

Everything before "move 'git-difftool' out of contrib" can be applied to master directly since it is not involved in the refactor.

We'll need to revert:
	d3b8cec difftool: move 'git-difftool' out of contrib
to avoid a merge conflict in next.

In case anyone's curious, da/difftool originally contained 25 commits. Less is more.

Next: David Aguilar
Message 1 of 17 in “git-{merge,diff}tool refactor round three”
  1. David AguilarApr 6, 2009
  2. 01/14 doc/merge-config: list ecmerge as a built-in merge toolDavid Aguilar, Apr 6, 2009
  3. 02/14 git-mergetool/difftool: make (g)vimdiff workable under WindowsDavid Aguilar, Apr 6, 2009
  4. 03/14 git-mergetool: add new merge tool TortoiseMergeDavid Aguilar, Apr 6, 2009
  5. 04/14 difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiffDavid Aguilar, Apr 6, 2009
  6. 05/14 difftool: remove the backup file featureDavid Aguilar, Apr 6, 2009
  7. 06/14 difftool: use perl built-ins when testing for msysDavid Aguilar, Apr 6, 2009
  8. 07/14 difftool: add a -y shortcut for --no-promptDavid Aguilar, Apr 6, 2009
  9. 08/14 difftool/mergetool: add diffuse as merge and diff toolDavid Aguilar, Apr 6, 2009
  10. 09/14 difftool: move 'git-difftool' out of contribDavid Aguilar, Apr 6, 2009
  11. 10/14 difftool: add various git-difftool testsDavid Aguilar, Apr 6, 2009
  12. 11/14 difftool: add support for a difftool.prompt config variableDavid Aguilar, Apr 6, 2009
  13. 12/14 bash completion: add git-difftoolDavid Aguilar, Apr 6, 2009
  14. 13/14 mergetool: use $( ... ) instead of `backticks`David Aguilar, Apr 6, 2009
  15. 14/14 difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar, Apr 6, 2009
  16. Markus HeidelbergApr 6, 2009
  17. Markus HeidelbergApr 6, 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.