diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-12-15 13:00:25 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-15 13:00:25 +0900 |
| commit | b21ebb671bb7dea8d342225f0d66c41f4e54d5ca (patch) | |
| tree | d5e62fb29ab9d5a80a8d391dbc5b39971dfcce51 /.gitattributes | |
| parent | Prepare for 2.21 cycle to start soonish (diff) | |
| parent | Git 2.20.1 (diff) | |
| download | tgif-b21ebb671bb7dea8d342225f0d66c41f4e54d5ca.tar.xz | |
Sync with Git 2.20.1
* maint:
Git 2.20.1
.gitattributes: ensure t/oid-info/* has eol=lf
t9902: 'send-email' test case requires PERL
t4256: mark support files as LF-only
parse-options: fix SunCC compiler warning
help -a: handle aliases with long names gracefully
help.h: fix coding style
run-command: report exec failure
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 |