summaryrefslogtreecommitdiffstats
path: root/BaseTools/Conf
diff options
context:
space:
mode:
authorLeif Lindholm <leif.lindholm@linaro.org>2019-09-18 21:35:08 +0100
committerLeif Lindholm <leif.lindholm@linaro.org>2019-10-04 11:18:22 +0100
commit7ecf6717cfda0ed233fb69f8daff315a52663074 (patch)
tree18cd7541728cbf6ad084dead1df4baac338a7e50 /BaseTools/Conf
parentc63012886ce70872bc3980b067a963d8c196b9ce (diff)
downloadedk2-7ecf6717cfda0ed233fb69f8daff315a52663074.tar.gz
edk2-7ecf6717cfda0ed233fb69f8daff315a52663074.tar.bz2
edk2-7ecf6717cfda0ed233fb69f8daff315a52663074.zip
BaseTools: fix line endings in SetupGit.py Conf files
A file header license/copyright header copied around in commit 5b3e695d8ac5 ("BaseTools: add centralized location for git config files") was missing a CR - add it in both faulty locations. Cc: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <liming.gao@intel.com> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> Reviewed-by: Bob Feng <bob.c.feng@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com> Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Diffstat (limited to 'BaseTools/Conf')
-rw-r--r--BaseTools/Conf/diff.order2
-rw-r--r--BaseTools/Conf/gitattributes2
2 files changed, 2 insertions, 2 deletions
diff --git a/BaseTools/Conf/diff.order b/BaseTools/Conf/diff.order
index 68b926ca94..4361817012 100644
--- a/BaseTools/Conf/diff.order
+++ b/BaseTools/Conf/diff.order
@@ -2,7 +2,7 @@
# Copyright (c) 2019, Linaro Ltd. All rights reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
+#
*.dec
*.dsc.inc
*.dsc
diff --git a/BaseTools/Conf/gitattributes b/BaseTools/Conf/gitattributes
index 9b6ab81a47..58b93e9d4c 100644
--- a/BaseTools/Conf/gitattributes
+++ b/BaseTools/Conf/gitattributes
@@ -2,7 +2,7 @@
# Copyright (c) 2019, Linaro Ltd. All rights reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
+#
*.efi -diff
*.EFI -diff
*.bin -diff