projects / platform / upstream / automake.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 05e1662)
git metadata update.
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Mon, 16 Jun 2008 17:36:25 +0000 (19:36 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Mon, 16 Jun 2008 17:36:25 +0000 (19:36 +0200)
* .gitattributes: Use merge-changelog driver for ChangeLog.
* .gitignore: Ignore configure.lineno, config.status.lineno.

.gitattributes [new file with mode: 0644] patch | blob
.gitignore patch | blob | history

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..e8495d5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog
diff --git a/.gitignore b/.gitignore
index 63230ba..81e5a98 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,7 @@ automake
 config.cache
 config.log
 config.status
+config.status.lineno
+configure.lineno
 tags
 TAGS
Domain: System / Base;