]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa83f7a ce69269)
Merge branch 'jk/difftool-in-subdir' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:11:08 +0000 (15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:14:40 +0000 (15:14 -0800)
commita558332f5eda1f9d4cb4abe0e68062c625e5049f
treeafdbb6a80b0714ddbdf7e67f8ac69f2772d8e780tree | snapshot
parentaa83f7a2a4a677e9eca4a599f47e027ad06716d1commit | diff
parentce6926974ec7b28ad43c387d5aa8ae7ea9f72e65commit | diff
Merge branch 'jk/difftool-in-subdir' into maint

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.