From df844034849c88ab7e4576573822900f88eefba4 Mon Sep 17 00:00:00 2001 From: Arti Zirk Date: Mon, 12 Nov 2018 16:23:43 +0200 Subject: [PATCH] remove gitconfig options --- .gitconfig | 3 ++- .gitignore | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitconfig b/.gitconfig index d53f1e1..4afec1c 100644 --- a/.gitconfig +++ b/.gitconfig @@ -2,6 +2,7 @@ name = Arti Zirk email = arti.zirk@gmail.com [merge] - ff = true + tool = meld + [alias] plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e71a4f0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.cfg