Skip to content

Instantly share code, notes, and snippets.

@whyleee
Created Nov 14, 2018
Embed
What would you like to do?
[user]
name = Pavel Nezhencev
email = pavel.nezhencev@creuna.com
[core]
autocrlf = true
editor = code --wait
[push]
default = simple
[alias]
ll = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
lf = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
stash-rename = "!_() { rev=$(git rev-parse $1) && git stash drop $1 || exit 1 ; git stash store -m $2 $rev; }; _"
sapply = "!f() { git stash apply stash^{/$*}; }; f"
[diff "utf-16"]
textconv = "iconv -f utf-16 -t utf-8"
#kdiff3
[merge]
tool = kdiff3
[mergetool "kdiff3"]
cmd = \"C:\\\\Program Files\\\\KDiff3\\\\kdiff3\" $BASE $LOCAL $REMOTE -o $MERGED
[diff]
tool = kdiff3
[difftool "kdiff3"]
cmd = \"C:\\\\Program Files\\\\KDiff3\\\\kdiff3\" $BASE $LOCAL $REMOTE
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[credential]
helper = manager
[winUpdater]
recentlySeenVersion = 2.19.1.windows.1
[difftool "sourcetree"]
cmd = '' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = "'' "
trustExitCode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment