From 06d37a273c07770e0c2b00435e5b93fb62050ae9 Mon Sep 17 00:00:00 2001 From: druckdev Date: Sun, 16 May 2021 00:51:29 +0200 Subject: [PATCH] git:pull: Use fast-forward only If I cannot fast-forward I want to stop and think about how I want to continue (merge or rebase). --- .config/git/config | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/git/config b/.config/git/config index 341a6cc..bbaa246 100644 --- a/.config/git/config +++ b/.config/git/config @@ -27,6 +27,7 @@ path = user.config [pull] rebase = true + ff = yes [merge] log = true tool = nvimdiff