From d611d918b849d687a934b5f66153c140eb129288 Mon Sep 17 00:00:00 2001 From: Dirk Alders Date: Sat, 30 Sep 2023 09:04:12 +0200 Subject: [PATCH] pull strategy add to config --- gitconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitconfig b/gitconfig index e6fd8af..e0bed2e 100755 --- a/gitconfig +++ b/gitconfig @@ -5,4 +5,5 @@ git config --global user.email dirk@mount-mockery.de # git config --global diff.tool meld git config --global merge.tool meld -git config --global --add difftool.prompt false \ No newline at end of file +git config --global --add difftool.prompt false +git config --global pull.rebase false