From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 16 Jun 2008 17:36:25 +0000 (+0200)
Subject: git metadata update.
X-Git-Tag: v1.10b~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a7e5fe47745de5269bf1467bda697ab86d01217;p=thirdparty%2Fautomake.git

git metadata update.

* .gitattributes: Use merge-changelog driver for ChangeLog.
* .gitignore: Ignore configure.lineno, config.status.lineno.
---

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