[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-150-g0a7e5fe

[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=0a7e5fe47745de5269bf1467bda697ab86d01217

The branch, master has been updated
       via  0a7e5fe47745de5269bf1467bda697ab86d01217 (commit)
      from  05e1662d817d563416ee00d9778b8429ee05a6ca (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 0a7e5fe47745de5269bf1467bda697ab86d01217
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