From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Aug 2016 21:48:39 +0000 (-0700)
Subject: Merge branch 'jk/difftool-in-subdir'
X-Git-Tag: v2.10.0-rc0~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7647537e3e8f263306e22cb22b4f4f7b09589b19;p=git

Merge branch 'jk/difftool-in-subdir'

"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
---

7647537e3e8f263306e22cb22b4f4f7b09589b19