git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f723df5 ce69269)
Merge branch 'jk/difftool-in-subdir'
authorJunio C Hamano <redacted>
Tue, 27 Dec 2016 08:11:43 +0000 (00:11 -0800)
committerJunio C Hamano <redacted>
Tue, 27 Dec 2016 08:11:43 +0000 (00:11 -0800)
commit5a5d3f1f1255559080f754fb202887f1566d8db3
tree0122f11c124396f0839c8a03ff74dbb01a88f963tree | snapshot
parentf723df581075ae70252a93ba91dcd017f338236ecommit | diff
parentce6926974ec7b28ad43c387d5aa8ae7ea9f72e65commit | diff
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
git-difftool.perl diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT