about summary refs log tree commit diff
diff options
context:
space:
mode:
-rwxr-xr-xgit/.gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index a4d8591..92f196f 100755
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -6,3 +6,5 @@
 	default = simple
 [commit]
 	gpgsign = true
+[pull]
+	ff = only