[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-1-24-g8acf1d4

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=8acf1d4ab1ff0f5094ad5fb54d9505875c65bf96

The branch, branch-1-10 has been updated
       via  8acf1d4ab1ff0f5094ad5fb54d9505875c65bf96 (commit)
      from  990bdcb58404dcade788184ca6e283d0f6efd813 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8acf1d4ab1ff0f5094ad5fb54d9505875c65bf96
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Jun 16 19:36:25 2008 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 .gitattributes |    1 +
 .gitignore     |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)
 create mode 100644 .gitattributes

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


hooks/post-receive
--
GNU Automake