.gitconfig: -# ChangeLog merge attempt

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644 (file)
index d4e37a2..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-ChangeLog merge=git-merge-changelog

diff --git a/.gitconfig b/.gitconfig
index dfaec75..191f05f 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -13,13 +13,6 @@
        ff = only
 #      rebase = true
 
-# ChangeLog merge attempt:
-#[merge "git-merge-changelog"]
-#      name = git-merge-changelog
-#      driver = /usr/bin/git-merge-changelog %O %A %B
-# ChangeLog merge attempt:
-#[core]
-#      attributesfile = ~/.gitattributes
 # golang:
 #[http]
 #      cookiefile = /home/jkratoch/.gitcookies