]> Sergey Matveev's repositories - dotfiles.git/commitdiff
projects / dotfiles.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 708973a)
Modern git requires pull.ff setting
authorSergey Matveev <stargrave@stargrave.org>
Wed, 10 Jun 2020 13:25:22 +0000 (16:25 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Wed, 10 Jun 2020 13:25:22 +0000 (16:25 +0300)
git/.gitconfig patch | blob | history

diff --git a/git/.gitconfig b/git/.gitconfig
index c5eff0d930a8b7ffa71db3a193e79fc642660991..0263b614a5323972a520d289b4be8ddd385cbe30 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -36,3 +36,5 @@
        lineNumber = true
 [merge]
        tool = vimdiff
+[pull]
+       ff = only
Stargrave's dotfiles