| commit | 4fb4b02d98310f4f859f7d52f57f36d49198be5c | |
| author | Charles Bailey <cbailey32@bloomberg.net> | |
| Sat, 11 Oct 2014 08:39:38 +0000 (11 01:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Oct 2014 21:12:20 +0000 (15 14:12 -0700) | ||
| tree | e0d306e3100bb5f6c19dbe70d44898082b52cbb8 | treesnapshot (tar.gz zip) |
| parent | 7bfb7c357cd33a9f3a72d65b0df96e054d2a9f06 | commitdiff |
difftool: don't assume that default sh is sane
git-difftool used to create a command list script containing $( ... )
and explicitly calls "sh -c" with this list.
Instead, allow mergetool --tool-help to take a mode parameter and call
mergetool directly to invoke the show_tool_help function. This mode
parameter is intented for use solely by difftool.
Signed-off-by: Charles Bailey <cbailey32@bloomberg.net>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-difftool used to create a command list script containing $( ... )
and explicitly calls "sh -c" with this list.
Instead, allow mergetool --tool-help to take a mode parameter and call
mergetool directly to invoke the show_tool_help function. This mode
parameter is intented for use solely by difftool.
Signed-off-by: Charles Bailey <cbailey32@bloomberg.net>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-difftool.perl | diffblobblamehistory | |
| git-mergetool.sh | diffblobblamehistory |