Changes in v3:
- Removed unused shell variable (SUBDIRECTORY_OK) from patch 7.
- Changed patches 7 and 8 to support calling 'difftool --dir-diff' from
a subdirectory of the repo.
- Changed patch 8 to support
- Added patch 10, which makes mixing --prompt and --no-prompt and error.
- Added tests for new difftool options in patches 11 and 12.
- Patches 1-6 and 9 did not change and have not been resent.
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 (12):
difftool: parse options using Getopt::Long
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: teach dir-diff to copy modified files back to working tree
difftool: print list of valid tools with '--tool-help'
difftool: do not allow mix of '--prompt' with '--no-prompt'
t7800: add test for difftool --tool-help
t7800: add tests for difftool --dir-diff
Documentation/git-difftool.txt | 17 ++-
git-difftool--helper.sh | 19 ++-
git-difftool.perl | 264 +++++++++++++++++++++++++++-------------
t/t7800-difftool.sh | 59 +++++++--
4 files changed, 254 insertions(+), 105 deletions(-)
--
1.7.10.rc1.39.g6e141f
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html