summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Lindholm <leif.lindholm@linaro.org>2019-06-10 19:54:09 +0800
committerFeng, Bob C <bob.c.feng@intel.com>2019-06-12 10:10:10 +0800
commit5b3e695d8ac5de5220c8520091832d507e6f9542 (patch)
treef3c981f7352368ca650f4fbf2f415373c6d65bc4
parent9e2416ae2e1d26c6e6daa58353de519745bb322d (diff)
downloadedk2-5b3e695d8ac5de5220c8520091832d507e6f9542.tar.gz
edk2-5b3e695d8ac5de5220c8520091832d507e6f9542.tar.bz2
edk2-5b3e695d8ac5de5220c8520091832d507e6f9542.zip
BaseTools: add centralized location for git config files
Before adding the git environment initialization script, add the following files that will be pointed to after running said script: - BaseTools/Conf/diff.order - BaseTools/Conf/gitattributes Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
-rw-r--r--BaseTools/Conf/diff.order13
-rw-r--r--BaseTools/Conf/gitattributes19
2 files changed, 32 insertions, 0 deletions
diff --git a/BaseTools/Conf/diff.order b/BaseTools/Conf/diff.order
new file mode 100644
index 0000000000..68b926ca94
--- /dev/null
+++ b/BaseTools/Conf/diff.order
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2019, Linaro Ltd. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+*.dec
+*.dsc.inc
+*.dsc
+*.fdf
+*.inf
+*.h
+*.vfr
+*.c
diff --git a/BaseTools/Conf/gitattributes b/BaseTools/Conf/gitattributes
new file mode 100644
index 0000000000..9b6ab81a47
--- /dev/null
+++ b/BaseTools/Conf/gitattributes
@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2019, Linaro Ltd. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+*.efi -diff
+*.EFI -diff
+*.bin -diff
+*.BIN -diff
+*.raw -diff
+*.RAW -diff
+*.bmp -diff
+*.BMP -diff
+*.dec diff=ini
+*.dsc diff=ini
+*.dsc.inc diff=ini
+*.fdf diff=ini
+*.fdf.inc diff=ini
+*.inf diff=ini