diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:48:39 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:48:39 -0700 |
commit | 7647537e3e8f263306e22cb22b4f4f7b09589b19 (patch) | |
tree | fc3ace2fe023a86be36d7f3438cd4644ffb5372d /iterator.h | |
parent | Merge branch 'va/i18n' (diff) | |
parent | difftool: use Git::* functions instead of passing around state (diff) | |
download | tgif-7647537e3e8f263306e22cb22b4f4f7b09589b19.tar.xz |
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
Diffstat (limited to 'iterator.h')
0 files changed, 0 insertions, 0 deletions