| commit | 9b601eafd1437df2e11b032bfbfd1ac5d32d3290 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Aug 2016 16:16:57 +0000 (12 09:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Aug 2016 16:16:57 +0000 (12 09:16 -0700) | ||
| tree | fa93de54b9cce0e537da90bd947e817f9af6cd43 | treesnapshot (tar.gz zip) |
| parent | f4fd6276619dfe7cf9a024730ca65b1bd0b3492b | commitdiff |
| parent | 32b8c581ecf35e73bebe2c6e9f6de617807b7f91 | commitdiff |
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
"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 |