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"