Archives/foodotfiles
2
1
Fork 0
mirror of https://git.korhonen.cc/FunctionalHacker/dotfiles.git synced 2024-11-18 21:27:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove git mergetool and difftool, use zsh diffview alias instead

Browse Source 
This is because as a git tool, it wants to open each file separately.
Neovim and diffview plugin provide a handy UI to manage multiple files
in diff and merge
This commit is contained in:
Marko Korhonen 2024-01-24 22:48:11 +02:00
parent 22a4aad249
commit e3e9848d0e
No known key found for this signature in database
GPG Key ID: A7F78BCB859CD890
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
home/.config/git/config
View File

@ -30,15 +30,6 @@ prompt = false
[mergetool "nvim"] [mergetool "nvim"]
cmd = nvim +DiffviewOpen cmd = nvim +DiffviewOpen
[diff]
tool = nvim
[difftool]
prompt = false
[difftool "nvim"]
cmd = nvim +DiffviewOpen
[pull] [pull]
rebase = merges rebase = merges

5
home/.config/zsh/04-aliases.zsh
View File

@ -10,6 +10,11 @@ alias gs='git status'
alias gpull='git pull' alias gpull='git pull'
alias gpush='git push' alias gpush='git push'
# Open nvim with diffview
# Handy plugin for viewing git diffs
# and handling merges
alias diffview='nvim +DiffviewOpen'
# Rename grc alias from forgit since it # Rename grc alias from forgit since it
# collides with the grc colorizer # collides with the grc colorizer
forgit_revert_commit=fgrc forgit_revert_commit=fgrc