diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-22 14:15:14 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-22 14:15:14 +0900 |
| commit | 9e0f06d55df5855178ff41342937943604f6e97c (patch) | |
| tree | 496489bd5c449b78420c301d2b00c82b42fe7031 /Documentation/git-merge-tree.txt | |
| parent | Prepare for 2.15.2 (diff) | |
| parent | Git 2.14.4 (diff) | |
| download | tgif-9e0f06d55df5855178ff41342937943604f6e97c.tar.xz | |
Sync with Git 2.14.4
* maint-2.14:
Git 2.14.4
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 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions