From ccc330d795ede8d31c92308288b8448cb7570158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Fri, 11 Jun 2021 23:40:15 +0200
Subject: [PATCH] Backport

---
 config/git/config  | 3 +++
 config/shell/shenv | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/git/config b/config/git/config
index 60faebb..b99c120 100644
--- a/config/git/config
+++ b/config/git/config
@@ -14,3 +14,6 @@
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+[pull]
+	ff = only
+
diff --git a/config/shell/shenv b/config/shell/shenv
index 151385c..b8dcac9 100644
--- a/config/shell/shenv
+++ b/config/shell/shenv
@@ -8,7 +8,7 @@
 export PAGER=less
 export EDITOR=nvim
 export VISUAL=nvim
-export BROWSER=firefox
+export BROWSER=qutebrowser
 
 direnv() { # environment variable name, path
     export "$1"="$2"