From 6bca8ccaad1a7c32b7cd1f03d896045a427afbf0 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Sat, 13 Jun 2020 14:15:10 +0530
Subject: [PATCH] git: gitconfig: Use merge as default strategy for git pull

git config pull.rebase false  # merge (the default strategy)
git config pull.rebase true   # rebase
git config pull.ff only       # fast-forward only

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
---
 git/.gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index 8ca325d..26227a7 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -20,3 +20,5 @@
 	keepBackup = false
 [commit]
 	verbose = true
+[pull]
+	rebase = false