[user] email = matthew@binning.dev name = Matthew Binning [diff] tool = vimdiff [difftool] prompt = false [difftool "sdiff"] cmd = cmddiff $LOCAL $REMOTE [merge] tool = fugitive [alias] df = difftool sdiff = difftool --ignore-submodules --tool=sdiff [mergetool] prompt = false [mergetool "fugitive"] cmd = vim -f -c \"Gvdiff\" \"$MERGED\"