| commit | 5a5d3f1f1255559080f754fb202887f1566d8db3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Dec 2016 08:11:43 +0000 (27 00:11 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Dec 2016 08:11:43 +0000 (27 00:11 -0800) | ||
| tree | 0122f11c124396f0839c8a03ff74dbb01a88f963 | treesnapshot (tar.gz zip) |
| parent | f723df581075ae70252a93ba91dcd017f338236e | commitdiff |
| parent | ce6926974ec7b28ad43c387d5aa8ae7ea9f72e65 | commitdiff |
Merge branch 'jk/difftool-in-subdir'
Even though an fix was attempted in Git 2.9.3 days, but running
"git difftool --dir-diff" from a subdirectory never worked. This
has been fixed.
* jk/difftool-in-subdir:
difftool: rename variables for consistency
difftool: chdir as early as possible
difftool: sanitize $workdir as early as possible
difftool: fix dir-diff index creation when in a subdirectory
Even though an fix was attempted in Git 2.9.3 days, but running
"git difftool --dir-diff" from a subdirectory never worked. This
has been fixed.
* jk/difftool-in-subdir:
difftool: rename variables for consistency
difftool: chdir as early as possible
difftool: sanitize $workdir as early as possible
difftool: fix dir-diff index creation when in a subdirectory
| git-difftool.perl | diff1 | diff2 | blobhistory |