diff options
Diffstat (limited to '.local/bin/confgit.sh')
| -rwxr-xr-x | .local/bin/confgit.sh | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/.local/bin/confgit.sh b/.local/bin/confgit.sh index e1db9a4..643080b 100755 --- a/.local/bin/confgit.sh +++ b/.local/bin/confgit.sh @@ -108,24 +108,19 @@ git config --global mergetool.vscode.cmd "code --wait \$MERGED" # Editors if [ "$(command -v code)" ] && [ "$(env | grep VSCODE)" ]; then - export EDITOR="code" - export VISUAL="code" git config --global core.editor "code --wait" git config --global diff.tool vscode git config --global merge.tool vscode -#elif [ "$(command -v hx)" ]; then -# export EDITOR="hx" -# export VISUAL="hx" -# git config --global core.editor hx -# # Still can't find whether helix supports merge contents -# git config --global diff.tool vim -# git config --global merge.tool vim else - export EDITOR="vim" - export VISUAL="vim" - git config --global core.editor vim - git config --global diff.tool vim - git config --global merge.tool vim + if [ "$(command -v nvim)" ]; then + git config --global core.editor nvim + git config --global diff.tool nvim + git config --global merge.tool nvim + else + git config --global core.editor vim + git config --global diff.tool vim + git config --global merge.tool vim + fi fi # Use pager for large diffs |