diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:26:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:26:52 -0700 |
| commit | 26696382ecc3fd9895da117311d234501127cf81 (patch) | |
| tree | ceaf3a3bf3d488b408eb51903af06c0fc0714df8 /Documentation/git-cat-file.txt | |
| parent | Merge branch 'tg/index-v4-format' (diff) | |
| parent | t7800: add a difftool test for .git-files (diff) | |
| download | tgif-26696382ecc3fd9895da117311d234501127cf81.tar.xz | |
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
Diffstat (limited to 'Documentation/git-cat-file.txt')
0 files changed, 0 insertions, 0 deletions