]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 13b49f1 fcfec8b)
Merge branch 'da/difftool-git-files'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:26:52 +0000 (14:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:26:52 +0000 (14:26 -0700)
commit26696382ecc3fd9895da117311d234501127cf81
treeceaf3a3bf3d488b408eb51903af06c0fc0714df8tree | snapshot
parent13b49f1e7463c46272c0b3b9b1952dc519086b6dcommit | diff
parentfcfec8bd9a9bf0a0f36ba4aed85f5768988aa946commit | diff
Merge branch 'da/difftool-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
Unnamed repository; edit this file 'description' to name the repository.