diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-12-15 04:24:32 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-15 04:24:32 +0100 |
| commit | 3f8c27c369833ac0eb473cadbec8c9deb0ee311b (patch) | |
| tree | 1a9e718b6c27fcc2cb37e9058e860d5f3e97532a /.gitattributes | |
| parent | Git 2.20 (diff) | |
| parent | .gitattributes: ensure t/oid-info/* has eol=lf (diff) | |
| download | git-3f8c27c369833ac0eb473cadbec8c9deb0ee311b.tar.xz git-3f8c27c369833ac0eb473cadbec8c9deb0ee311b.zip | |
Merge branch 'ds/hash-independent-tests-fix' into maint
Test portability fix.
* ds/hash-independent-tests-fix:
.gitattributes: ensure t/oid-info/* has eol=lf
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index acf853e029..9fa72ad450 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ /command-list.txt eol=lf /GIT-VERSION-GEN eol=lf /mergetools/* eol=lf +/t/oid-info/* eol=lf /Documentation/git-merge.txt conflict-marker-size=32 /Documentation/gitk.txt conflict-marker-size=32 /Documentation/user-manual.txt conflict-marker-size=32 |