diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-29 17:09:58 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-29 17:10:05 +0900 |
| commit | 7913f53b5628997165e075008d6142da1c04271a (patch) | |
| tree | ec9ffa97b492e873118bc9e3d521b9cab63b7098 /merge-recursive.h | |
| parent | The sixth batch for 2.18 (diff) | |
| parent | Git 2.17.1 (diff) | |
| download | tgif-7913f53b5628997165e075008d6142da1c04271a.tar.xz | |
Sync with Git 2.17.1
* maint: (25 commits)
Git 2.17.1
Git 2.16.4
Git 2.15.2
Git 2.14.4
Git 2.13.7
fsck: complain when .gitmodules is a symlink
index-pack: check .gitmodules files with --strict
unpack-objects: call fsck_finish() after fscking objects
fsck: call fsck_finish() after fscking objects
fsck: check .gitmodules content
fsck: handle promisor objects in .gitmodules check
fsck: detect gitmodules files
fsck: actually fsck blob data
fsck: simplify ".git" check
index-pack: make fsck error message more specific
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
...
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions