diff options
-rwxr-xr-x | bin/init/load-settings.sh | 1 | ||||
-rw-r--r-- | gitconfig | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/bin/init/load-settings.sh b/bin/init/load-settings.sh index 78681aa..79f5fba 100755 --- a/bin/init/load-settings.sh +++ b/bin/init/load-settings.sh | |||
@@ -6,6 +6,7 @@ export PATH=$BIN_DIR:$PATH | |||
6 | export EDITOR=nvim | 6 | export EDITOR=nvim |
7 | export VISUAL=nvim | 7 | export VISUAL=nvim |
8 | export TIG_EDITOR=nvim | 8 | export TIG_EDITOR=nvim |
9 | export GIT_EDITOR=nvim | ||
9 | export TERM=xterm-256color | 10 | export TERM=xterm-256color |
10 | export XDG_CONFIG_HOME=~/.config | 11 | export XDG_CONFIG_HOME=~/.config |
11 | export XDG_STATE_HOME=~/.local/share/ | 12 | export XDG_STATE_HOME=~/.local/share/ |
@@ -21,10 +21,6 @@ | |||
21 | git stash drop stash@{1} | 21 | git stash drop stash@{1} |
22 | swapprotocol = !swap-protocol.bash | 22 | swapprotocol = !swap-protocol.bash |
23 | 23 | ||
24 | [core] | ||
25 | editor = vim | ||
26 | pager = | ||
27 | |||
28 | [merge] | 24 | [merge] |
29 | tool = vimdiff | 25 | tool = vimdiff |
30 | 26 | ||