summaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
authorDavid Vazgenovich Shakaryan <dvshakaryan@gmail.com>2021-05-31 02:13:49 -0700
committerDavid Vazgenovich Shakaryan <dvshakaryan@gmail.com>2021-05-31 02:13:49 -0700
commit051d9793e1dfb5318d50aa415a01792ac42469f3 (patch)
tree6e54c4b7e55cc256e945b24bceebb80a598cd2fd /gitconfig
parentd00051f4ec5f22e7ecdb3ff4f1134dad982e8d8a (diff)
downloaddotfiles-051d9793e1dfb5318d50aa415a01792ac42469f3.tar.gz
dotfiles-051d9793e1dfb5318d50aa415a01792ac42469f3.tar.xz
some things have changed in the past seven years
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index ae1b2df..21ad0c8 100644
--- a/gitconfig
+++ b/gitconfig
@@ -5,3 +5,5 @@
editor = vim
[push]
default = simple
+[pull]
+ ff = only