diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:43 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:43 -0800 |
commit | 5a5d3f1f1255559080f754fb202887f1566d8db3 (patch) | |
tree | 0122f11c124396f0839c8a03ff74dbb01a88f963 /progress.c | |
parent | Merge branch 'ld/p4-compare-dir-vs-symlink' (diff) | |
parent | difftool: rename variables for consistency (diff) | |
download | tgif-5a5d3f1f1255559080f754fb202887f1566d8db3.tar.xz |
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
Diffstat (limited to 'progress.c')
0 files changed, 0 insertions, 0 deletions