diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:28:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:28:44 -0700 |
| commit | cae097722162c852ab81c50efe8b25a84b6a5dff (patch) | |
| tree | 270ba0c48a0c8be60c307462247d802b142bd6cc /t/t4013/diff.diff-tree_-p_-m_master | |
| parent | Sync with maint (diff) | |
| parent | difftool: print list of valid tools with '--tool-help' (diff) | |
| download | tgif-cae097722162c852ab81c50efe8b25a84b6a5dff.tar.xz | |
Merge branch 'th/difftool-diffall'
Rolls the two-directory-diff logic from diffall script (in contrib/) into
"git difftool" framework.
By Tim Henigan
* th/difftool-diffall:
difftool: print list of valid tools with '--tool-help'
difftool: teach difftool to handle directory diffs
difftool: eliminate setup_environment function
difftool: stop appending '.exe' to git
difftool: remove explicit change of PATH
difftool: exit(0) when usage is printed
difftool: add '--no-gui' option
difftool: parse options using Getopt::Long
Diffstat (limited to 't/t4013/diff.diff-tree_-p_-m_master')
0 files changed, 0 insertions, 0 deletions