dotfiles
bugabingas dorkfiles
owned by bugabinga
git: update git settings
8fdda561bebb2105e1941f99fcdf35041ead4ea0
Oliver Krylow <o.krylow@isp-insoft.de> ·
unsigned
Browse filesCompare with HEAD
Changed files (1)
3 - dl
= -c diff.external=difft log -p --ext-diff 6 - ds
= -c diff.external=difft show --ext-diff 9 - dft
= -c diff.external=difft diff 36 - colorMoved
= default 43 - cmd
= "meld \"$LOCAL\" \"$REMOTE\"" 45 -[
difftool "difftastic"]
46 - cmd
= "difft \"$LOCAL\" \"$REMOTE\"" 59 - cmd
= "meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\" " 62 - cmd
= "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\" " 65 - autoSetupRemote
= true 66 - default
= "upstream" 72 - diffFilter
= delta --color-only 82 - diffFilter
= delta --color-only 85 - defaultBranch
= trunk 94 -[
difftool "difftastic"]
96 - cmd
= difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644" 115 - path
= .gitconfig.include 3 + dl
= -c diff.external=difft log -p --ext-diff 6 + ds
= -c diff.external=difft show --ext-diff 9 + dft
= -c diff.external=difft diff 26 + clean
= git-lfs clean -- %f 27 + smudge
= git-lfs smudge -- %f 28 + process
= git-lfs filter-process 42 + colorMoved
= default 49 + cmd
= "meld \"$LOCAL\" \"$REMOTE\"" 51 +[
difftool "difftastic"]
52 + cmd
= "difft \"$LOCAL\" \"$REMOTE\"" 65 + cmd
= "meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\" " 68 + cmd
= "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\" " 71 + autoSetupRemote
= true 72 + default
= "upstream" 78 + diffFilter
= delta --color-only 88 + diffFilter
= delta --color-only 91 + defaultBranch
= trunk 100 +[
difftool "difftastic"]
102 + cmd
= difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644" 121 + path
= .gitconfig.include