Last active
August 6, 2017 08:24
-
-
Save johnkors/98b6b4f3940ef1e3d609260cf5c1d813 to your computer and use it in GitHub Desktop.
git diff using word highlighting
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
[user] | |
name = mynanme | |
email = [email protected] | |
[credential] | |
helper = wincred | |
[push] | |
default = simple | |
[diff] | |
tool = bc3 | |
[difftool] | |
prompt = false | |
[difftool "vsdiffmerge"] | |
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t | |
[difftool "vsdiffmerge"] | |
keepbackup = false | |
[merge] | |
tool = bc3 | |
[mergetool] | |
prompt = false | |
keepBackup = false | |
[mergetool "vsdiffmerge"] | |
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m | |
trustexitcode = true | |
[mergetool "vsdiffmerge"] | |
keepbackup = false | |
[core] | |
autocrlf = input | |
[difftool "bc3"] | |
path = c:/Program Files/Beyond Compare 4/bcomp.exe | |
[mergetool "bc3"] | |
path = c:/Program Files/Beyond Compare 4/bcomp.exe | |
[alias] | |
gl = log --graph --pretty=format':%C(yellow)%h%Cgreen%d%Creset %s %C(white) %an, %ar%Creset' | |
br = for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))' | |
co = checkout | |
st = status | |
last = log -1 HEAD | |
d = diff -w --color-words="[^[:space:]]|([[:alnum:]]|UTF_8_GUARD)+" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment