diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-18 14:04:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 14:04:36 -0700 |
| commit | 01e13d0221e73febdcb98e26b4ae2882887421d8 (patch) | |
| tree | 42ef3c061af3cdd78fa78797b2fcec423611032c /Documentation/git-prune.txt | |
| parent | Merge branch 'jk/remote-pushremote-config-reading' into maint (diff) | |
| parent | t7800: add a difftool test for .git-files (diff) | |
| download | tgif-01e13d0221e73febdcb98e26b4ae2882887421d8.tar.xz | |
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
Diffstat (limited to 'Documentation/git-prune.txt')
0 files changed, 0 insertions, 0 deletions