| commit | 7647537e3e8f263306e22cb22b4f4f7b09589b19 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 8 Aug 2016 21:48:39 +0000 (8 14:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 8 Aug 2016 21:48:39 +0000 (8 14:48 -0700) | ||
| tree | fc3ace2fe023a86be36d7f3438cd4644ffb5372d | treesnapshot (tar.gz zip) |
| parent | 768ededa9c4e804ead6d473d4fe3a8092a77b05c | commitdiff |
| parent | 32b8c581ecf35e73bebe2c6e9f6de617807b7f91 | commitdiff |
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
"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 | blobhistory |