| commit | 01e13d0221e73febdcb98e26b4ae2882887421d8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Mar 2014 21:04:36 +0000 (18 14:04 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Mar 2014 21:04:36 +0000 (18 14:04 -0700) | ||
| tree | 42ef3c061af3cdd78fa78797b2fcec423611032c | treesnapshot (tar.gz zip) |
| parent | 4097a25429d09b61616845fbe6551587a30fa038 | commitdiff |
| parent | fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946 | commitdiff |
Merge branch 'da/difftool-git-files' into maint
"git difftool" misbehaved when the repository is bound to the
working tree with the ".git file" mechanism, where a textual file
".git" tells us where it is.
* da/difftool-git-files:
t7800: add a difftool test for .git-files
difftool: support repositories with .git-files
"git difftool" misbehaved when the repository is bound to the
working tree with the ".git file" mechanism, where a textual file
".git" tells us where it is.
* da/difftool-git-files:
t7800: add a difftool test for .git-files
difftool: support repositories with .git-files