summaryrefslogtreecommitdiffstats
path: root/config/git
diff options
context:
space:
mode:
Diffstat (limited to 'config/git')
-rw-r--r--config/git/config2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/git/config b/config/git/config
index a5dd072..ec672da 100644
--- a/config/git/config
+++ b/config/git/config
@@ -11,3 +11,5 @@
owner = Mitsuo Tokumori <[email protected]>
[init]
defaultBranch = master
+[pull]
+ ff = only