git: disable merge pull
This commit is contained in:
parent
d3800d7f31
commit
78f664da44
@ -8,5 +8,7 @@
|
|||||||
diff = auto
|
diff = auto
|
||||||
[push]
|
[push]
|
||||||
default = simple
|
default = simple
|
||||||
|
[pull]
|
||||||
|
ff = only
|
||||||
[credential]
|
[credential]
|
||||||
helper = syscmd(`find /usr/share/git /usr/share/doc/git ~/.local/bin -name git-credential-gnome-keyring || echo store')
|
helper = syscmd(`find /usr/share/git /usr/share/doc/git ~/.local/bin -name git-credential-gnome-keyring || echo store')
|
||||||
|
Loading…
Reference in New Issue
Block a user