diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-08-12 09:16:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-08-12 09:16:57 -0700 |
commit | 9b601eafd1437df2e11b032bfbfd1ac5d32d3290 (patch) | |
tree | fa93de54b9cce0e537da90bd947e817f9af6cd43 /bulk-checkin.h | |
parent | Merge branch 'jk/reset-ident-time-per-commit' into maint (diff) | |
parent | difftool: use Git::* functions instead of passing around state (diff) | |
download | tgif-9b601eafd1437df2e11b032bfbfd1ac5d32d3290.tar.xz |
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
Diffstat (limited to 'bulk-checkin.h')
0 files changed, 0 insertions, 0 deletions