diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-22 14:10:49 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-22 14:10:49 +0900 |
| commit | 7b01c71b64d25202d80b73cbd46104ebfddbdab3 (patch) | |
| tree | 98de7ee189397c8e539459ed1a699be47cc0bff3 /git-mergetool.sh | |
| parent | Git 2.14.3 (diff) | |
| parent | Git 2.13.7 (diff) | |
| download | tgif-7b01c71b64d25202d80b73cbd46104ebfddbdab3.tar.xz | |
Sync with Git 2.13.7
* maint-2.13:
Git 2.13.7
verify_path: disallow symlinks in .gitmodules
update-index: stat updated files earlier
verify_dotfile: mention case-insensitivity in comment
verify_path: drop clever fallthrough
skip_prefix: add case-insensitive variant
is_{hfs,ntfs}_dotgitmodules: add tests
is_ntfs_dotgit: match other .git files
is_hfs_dotgit: match other .git files
is_ntfs_dotgit: use a size_t for traversing string
submodule-config: verify submodule names as paths
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions