From: Tim Henigan <tim.henigan@gmail.com>
To: gitster@pobox.com, git@vger.kernel.org, davvid@gmail.com
Cc: Tim Henigan <tim.henigan@gmail.com>
Subject: [PATCH 0/9 v6] difftool: teach command to perform directory diffs
Date: Thu, 22 Mar 2012 15:52:15 -0400 [thread overview]
Message-ID: <1332445944-10944-1-git-send-email-tim.henigan@gmail.com> (raw)
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 reply other threads:[~2012-03-22 19:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-22 19:52 Tim Henigan [this message]
2012-03-22 19:52 ` [PATCH 1/9 v6] difftool: parse options using Getopt::Long Tim Henigan
2012-03-22 19:52 ` [PATCH 2/9 v6] difftool: add '--no-gui' option Tim Henigan
2012-03-22 19:52 ` [PATCH 3/9 v6] difftool: exit(0) when usage is printed Tim Henigan
2012-03-22 19:52 ` [PATCH 4/9 v6] difftool: remove explicit change of PATH Tim Henigan
2012-03-22 19:52 ` [PATCH 5/9 v6] difftool: stop appending '.exe' to git Tim Henigan
2012-03-22 19:52 ` [PATCH 6/9 v6] difftool: eliminate setup_environment function Tim Henigan
2012-03-22 19:52 ` [PATCH 7/9 v6] difftool: replace system call with Git::command_noisy Tim Henigan
2012-03-22 19:52 ` [PATCH 8/9 v6] difftool: teach difftool to handle directory diffs Tim Henigan
2012-03-22 19:52 ` [PATCH 9/9 v6] difftool: print list of valid tools with '--tool-help' Tim Henigan
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332445944-10944-1-git-send-email-tim.henigan@gmail.com \
--to=tim.henigan@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).