projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f7ba714 ce69269)
Merge branch 'jk/difftool-in-subdir' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2016 22:39:25 +0000 (14:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2016 22:39:26 +0000 (14:39 -0800)
commitc1056e014b74b9e8f12ec29df08086b5de1692e8
tree94f82107e01916109a1fd445547d31f3f7ac9f0atree | snapshot
parentf7ba7143876ec168c529f71fbb7918a03e784a7acommit | diff
parentce6926974ec7b28ad43c387d5aa8ae7ea9f72e65commit | diff
Merge branch 'jk/difftool-in-subdir' into next

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
Unnamed repository; edit this file 'description' to name the repository.