diff options
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-06-16 19:36:25 +0200 |
---|---|---|
committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-06-16 19:36:25 +0200 |
commit | 0a7e5fe47745de5269bf1467bda697ab86d01217 (patch) | |
tree | cae3edef0560683f4e18230d566ba4b443890746 /.gitattributes | |
parent | 05e1662d817d563416ee00d9778b8429ee05a6ca (diff) | |
download | automake-0a7e5fe47745de5269bf1467bda697ab86d01217.tar.gz |
git metadata update.
* .gitattributes: Use merge-changelog driver for ChangeLog.
* .gitignore: Ignore configure.lineno, config.status.lineno.
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..e8495d51e --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=merge-changelog |