Backport

2 years ago · ccc330d795
2 changed files with 4 additions and 1 deletions
--- 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
+
--- 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"