Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- [user]
- name = xxxxxxxxxxxxxxx
- email = xxxxxxxxxx@xxxxxxx.xxxx
- [credential]
- helper = manager
- [core]
- editor = nano
- [color]
- # Enable colors in color-supporting terminals
- ui = auto
- [filter "lfs"]
- clean = git-lfs clean -- %f
- smudge = git-lfs smudge -- %f
- process = git-lfs filter-process
- required = true
- [diff]
- tool = vsdiffmerge
- guitool = winmerge
- [difftool]
- prompt = false
- [difftool "winmerge"]
- path = C:/Program Files/WinMerge/winmergeu.exe
- cmd = \"C:/Program Files/WinMerge/winmergeu.exe\" -e -u -dl \"Local: $LOCAL\" -dr \"Remote: $REMOTE\" \"$LOCAL\" \"$REMOTE\"
- [difftool "wm"]
- cmd = winmerge.sh \"$LOCAL\" \"$REMOTE\"
- [difftool "vsdiffmerge"]
- cmd = \"C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsDiffMerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
- keepbackup = false
- trustexistcode = true
- [merge]
- tool = vsdiffmerge
- [mergetool]
- prompt = false
- [mergetool "winmerge"]
- path = C:/Program Files/WinMerge/winmergeu.exe
- cmd = \"C:/Program Files/WinMerge/winmergeu.exe\" -e -u -wl -wr -fm -dl \"Mine: $LOCAL\" -dm \"Merged: $BASE\" -dr \"Theirs: $REMOTE\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -o \"$MERGED\"
- keepbackup = false
- trustexistcode = true
- [mergetool "vsdiffmerge"]
- cmd = \"C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsDiffMerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
- keepbackup = false
- trustexistcode = true
- [pull]
- rebase = false
- [fetch]
- prune = false
- [rebase]
- autoStash = false
- [alias]
- lm = log --color --author=lech-jedrzej.wiecierzynski@sms-group.com --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
- lg = log --color --oneline --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
- wd = difftool --tool=winmerge
- wm = mergetool --tool=winmerge
- dn = diff --name-status
- gr = log --color --graph --oneline --decorate=short --branches='*'
- gl = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement