git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4097a25 fcfec8b)
Merge branch 'da/difftool-git-files' into maint
authorJunio C Hamano <redacted>
Tue, 18 Mar 2014 21:04:36 +0000 (14:04 -0700)
committerJunio C Hamano <redacted>
Tue, 18 Mar 2014 21:04:36 +0000 (14:04 -0700)
commit01e13d0221e73febdcb98e26b4ae2882887421d8
tree42ef3c061af3cdd78fa78797b2fcec423611032ctree | snapshot
parent4097a25429d09b61616845fbe6551587a30fa038commit | diff
parentfcfec8bd9a9bf0a0f36ba4aed85f5768988aa946commit | diff
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 clone https://git.99rst.org/PROJECT