From 4aa02f02edaace035a6821b7fcd4fbb72bc8a558 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sat, 19 Jun 2021 10:23:24 +0200 Subject: [PATCH] .gitconfig: -# ChangeLog merge attempt --- .gitattributes | 1 - .gitconfig | 7 ------- 2 files changed, 8 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 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 --- 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 -- 1.8.3.1