git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f4fd627 32b8c58)
Merge branch 'jk/difftool-in-subdir' into maint
authorJunio C Hamano <redacted>
Fri, 12 Aug 2016 16:16:57 +0000 (09:16 -0700)
committerJunio C Hamano <redacted>
Fri, 12 Aug 2016 16:16:57 +0000 (09:16 -0700)
commit9b601eafd1437df2e11b032bfbfd1ac5d32d3290
treefa93de54b9cce0e537da90bd947e817f9af6cd43tree | snapshot
parentf4fd6276619dfe7cf9a024730ca65b1bd0b3492bcommit | diff
parent32b8c581ecf35e73bebe2c6e9f6de617807b7f91commit | diff
Merge branch 'jk/difftool-in-subdir' into maint

"git difftool <paths>..." started in a subdirectory failed to
interpret the paths relative to that directory, which has been
fixed.

* jk/difftool-in-subdir:
  difftool: use Git::* functions instead of passing around state
  difftool: avoid $GIT_DIR and $GIT_WORK_TREE
  difftool: fix argument handling in subdirs
t/t7800-difftool.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT