diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-03-22 14:00:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-22 14:00:22 -0700 |
| commit | 204333b015a663a339c855c72b86034203b66a6a (patch) | |
| tree | 04978dc454e8dbb85ab406e1149934ff9c99e158 /Documentation/git-difftool.txt | |
| parent | The first batch in 2.32 cycle (diff) | |
| parent | mailmap: do not respect symlinks for in-tree .mailmap (diff) | |
| download | tgif-204333b015a663a339c855c72b86034203b66a6a.tar.xz | |
Merge branch 'jk/open-dotgitx-with-nofollow'
It does not make sense to make ".gitattributes", ".gitignore" and
".mailmap" symlinks, as they are supposed to be usable from the
object store (think: bare repositories where HEAD:.mailmap etc. are
used). When these files are symbolic links, we used to read the
contents of the files pointed by them by mistake, which has been
corrected.
* jk/open-dotgitx-with-nofollow:
mailmap: do not respect symlinks for in-tree .mailmap
exclude: do not respect symlinks for in-tree .gitignore
attr: do not respect symlinks for in-tree .gitattributes
exclude: add flags parameter to add_patterns()
attr: convert "macro_ok" into a flags field
add open_nofollow() helper
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions