Last active
June 20, 2017 19:27
-
-
Save schmich/34a035fdf1adb80173d5 to your computer and use it in GitHub Desktop.
git diff with gvim on Windows
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [core] | |
| excludesfile = ~/.gitignore_global | |
| editor = gvim | |
| autocrlf = false | |
| safecrlf = false | |
| [user] | |
| email = schmch@gmail.com | |
| name = Chris Schmich | |
| [push] | |
| default = current | |
| [alias] | |
| st = status --ignore-submodules=all | |
| stat = status --ignore-submodules=all | |
| ci = commit | |
| lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue) <%an>%Creset' --abbrev-commit | |
| df = difftool | |
| [color] | |
| ui = true | |
| [diff] | |
| tool = gvimdiff | |
| [difftool "gvimdiff"] | |
| cmd = "gvim -c 'set columns=250' -c 'wincmd =' -d" "$LOCAL" "$REMOTE" | |
| [difftool] | |
| prompt = false | |
| [merge] | |
| conflictstyle = diff3 | |
| [filter "lfs"] | |
| clean = git lfs clean %f | |
| smudge = git lfs smudge %f | |
| required = true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/sh | |
| exec "/c/Program Files (x86)/Vim/vim74/gvim.exe" "$@" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment