git: disable merge pull

This commit is contained in:
Gabriel Ebner 2017-06-18 15:46:55 +02:00
parent d3800d7f31
commit 78f664da44

@ -8,5 +8,7 @@
diff = auto
[push]
default = simple
[pull]
ff = only
[credential]
helper = syscmd(`find /usr/share/git /usr/share/doc/git ~/.local/bin -name git-credential-gnome-keyring || echo store')