remove gitconfig options

2018-11-12 16:23:43 +02:00 · 2018-11-12 16:23:43 +02:00 · df84403484
parent cb0240cd7d
commit df84403484
2 changed files with 3 additions and 1 deletions
--- 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
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+.cfg