projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 28c8a44 853e10c)
Merge branch 'da/difftool-dir-diff-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:30 +0000 (14:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:30 +0000 (14:49 -0800)
commit935a4783f72964e0fa72995c101542531081b094
tree415bf03a10403d26e6d383f0df2054880bdde654tree | snapshot
parent28c8a447dd4d6420fc08106efa1c288246b15845commit | diff
parent853e10c19755669bd4695b1d9fd81f3278466727commit | diff
Merge branch 'da/difftool-dir-diff-fix' into maint

"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.