diff options
| -rw-r--r-- | .config/git/config | 14 | ||||
| -rw-r--r-- | .zshrc | 6 |
2 files changed, 18 insertions, 2 deletions
diff --git a/.config/git/config b/.config/git/config index e82cf0b..e49d577 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,5 +1,5 @@ [core] - editor = vim + editor = nvim commentchar = ";" [help] @@ -15,6 +15,15 @@ tool = vimdiff ff = false +[mergetool "vimdiff"] + cmd = "__fn() { \ + if [ -z \"$BASE\" ]; then \ + nvim -d -c 'wincmd l' \"$LOCAL\" \"$MERGED\" \"$REMOTE\"; \ + else \ + nvim -d -c '4wincmd w | wincmd J | diffoff' \"$LOCAL\" \"$BASE\" \"$REMOTE\" \"$MERGED\"; \ + fi; \ + }; __fn" + [rebase] abbreviatecommands = true autosquash = true @@ -23,6 +32,9 @@ [diff] tool = vimdiff +[difftool "vimdiff"] + cmd = "nvim -R -d -c 'wincmd l' -c 'cd $GIT_PREFIX' \"$LOCAL\" \"$REMOTE\"" + [init] defaultbranch = main @@ -382,9 +382,13 @@ alias rm="rm -i" alias zmv='noglob zmv -W' alias fd='noglob fd' -alias e='vim' alias g='git' +alias vim='nvim' +alias vimdiff='nvim -d' +alias view='nvim -R' +alias e='nvim' + if [[ "$(uname)" == "Darwin" ]]; then alias o='open' else |