diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-08 13:04:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-08 13:04:52 -0800 |
| commit | 7ac6609d9afde0d56705842fd60abb41715c1d1e (patch) | |
| tree | 94cef0f47010b1c306b0a29df22026a6e5fc8fd0 /mergetools/kdiff3 | |
| parent | Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' (diff) | |
| parent | submodules: fix ambiguous absolute paths under Windows (diff) | |
| download | tgif-7ac6609d9afde0d56705842fd60abb41715c1d1e.tar.xz | |
Merge branch 'jl/maint-submodule-relative'
By Jens Lehmann (3) and Johannes Sixt (1)
* jl/maint-submodule-relative:
submodules: fix ambiguous absolute paths under Windows
submodules: refactor computation of relative gitdir path
submodules: always use a relative path from gitdir to work tree
submodules: always use a relative path to gitdir
Diffstat (limited to 'mergetools/kdiff3')
0 files changed, 0 insertions, 0 deletions