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

[PATCH 0/9 v6] difftool: teach command to perform directory diffs

From
Tim Henigan <tim.henigan@gmail.com>
Date
Mar 22, 2012, 19:52 UTC
Message-ID
<1332445944-10944-1-git-send-email-tim.henigan@gmail.com>
Changes in v6:
  - Rebased series to insure Getopt::Long worked correctly from the start.
  - Squashed commits that added tests into the commits that added the
    new features.
Series Overview:

'git difftool' is a very useful command that allows git diffs to be opened in an external tool. Currently, difftool opens a separate instance of the external tool for each file that changed. This can be tedious when many files have changed.

This series teaches difftool to perform directory diffs, so that all file changes can be opened/reviewed in a single instance of the external tool.

This is the second phase of development for this feature. The first phase was added as a separate command (git diffall) in 1252bbe (contrib: add git-diffall script). During review of that script on the Git developers list, an informal development roadmap was suggested [1]. The next phase of that plan is to integrate the 'git-diffall' feature into 'difftool'. This series gets that done.

[1]: http://thread.gmane.org/gmane.comp.version-control.git/191297/focus=191383
Tim Henigan (9):
  difftool: parse options using Getopt::Long
  difftool: add '--no-gui' option
  difftool: exit(0) when usage is printed
  difftool: remove explicit change of PATH
  difftool: stop appending '.exe' to git
  difftool: eliminate setup_environment function
  difftool: replace system call with Git::command_noisy
  difftool: teach difftool to handle directory diffs
  difftool: print list of valid tools with '--tool-help'
 Documentation/git-difftool.txt |   17 ++-
 git-difftool--helper.sh        |   19 ++-
 git-difftool.perl              |  264 +++++++++++++++++++++++++++-------------
 t/t7800-difftool.sh            |   57 +++++++++
 4 files changed, 262 insertions(+), 95 deletions(-)
-- 
1.7.10.rc1.36.g15e879
Next: Tim Henigan
Message 1 of 10 in “difftool: teach command to perform directory diffs”
  1. 0/9 difftool: teach command to perform directory diffsTim Henigan, Mar 22, 2012
  2. 1/9 difftool: parse options using Getopt::LongTim Henigan, Mar 22, 2012
  3. 2/9 difftool: add '--no-gui' optionTim Henigan, Mar 22, 2012
  4. 3/9 difftool: exit(0) when usage is printedTim Henigan, Mar 22, 2012
  5. 4/9 difftool: remove explicit change of PATHTim Henigan, Mar 22, 2012
  6. 5/9 difftool: stop appending '.exe' to gitTim Henigan, Mar 22, 2012
  7. 6/9 difftool: eliminate setup_environment functionTim Henigan, Mar 22, 2012
  8. 7/9 difftool: replace system call with Git::command_noisyTim Henigan, Mar 22, 2012
  9. 8/9 difftool: teach difftool to handle directory diffsTim Henigan, Mar 22, 2012
  10. 9/9 difftool: print list of valid tools with '--tool-help'Tim Henigan, Mar 22, 2012

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.