projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8b58025 853e10c)
Merge branch 'da/difftool-dir-diff-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:20 +0000 (10:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:20 +0000 (10:57 -0800)
commitfd31a92ad6b258b6b093615c8d472617d19e654c
tree40dbbcc69369160572d341c6f3934d8ec675d317tree | snapshot
parent8b58025e3af1320f5420e28530a213d81929e0b7commit | diff
parent853e10c19755669bd4695b1d9fd81f3278466727commit | diff
Merge branch 'da/difftool-dir-diff-fix' into next

"git difftool --dir-diff" had a minor regression when started from
a subdirectory, which has been fixed.

* da/difftool-dir-diff-fix:
  difftool: fix dir-diff index creation when in a subdirectory
Unnamed repository; edit this file 'description' to name the repository.