From 0a7e5fe47745de5269bf1467bda697ab86d01217 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 16 Jun 2008 19:36:25 +0200 Subject: [PATCH] git metadata update. * .gitattributes: Use merge-changelog driver for ChangeLog. * .gitignore: Ignore configure.lineno, config.status.lineno. --- .gitattributes | 1 + .gitignore | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..e8495d51e --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=merge-changelog diff --git a/.gitignore b/.gitignore index 63230ba11..81e5a98ef 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,7 @@ automake config.cache config.log config.status +config.status.lineno +configure.lineno tags TAGS -- 2.47.2