epcim/setup_git_diff_like_a_pro.md

## setup_git_diff_like_a_pro.md

      
    Raw
  

              setup_git_diff_like_a_pro.md
            
          
    DirDiff - https://www.vim.org/scripts/script.php?script_id=102
Configuration

" Dirdiff
let g:DirDiffEnableMappings = 1
let g:DirDiffExcludes = "system,CVS,*.class,*.exe,.*.swp,pbgo*,pbdoc*,pbswagger*,pbccp*,_extschema*,*.lock"

CLI

vim "+DirDiff $FILE1 $FILE2"

With git (difftool: git d HEAD~3)

[diff]
  tool = meld # see the ~/bin/meld workarround below
  
[alias]
    d   = difftool --dir-diff

With mu_repo (on cmd like: mu upd)

~/bin/meld:
#!/bin/sh
# Wrapper for `mu-repo` aka `mu dd` or `mu upd`, to run diff it calls actually just "meld"
args="+DirDiff ${@}"
vim "$args"

advanced / related

configuration - https://minimul.com/compare-and-merge-directories-with-dirdiff.html
git diff with tabs - https://stackoverflow.com/questions/2428051/how-can-i-view-multiple-git-diffs-side-by-side-in-vim