Created
November 14, 2018 09:27
-
-
Save whyleee/bb7978af4a5b74514dd5c7295c8a9b74 to your computer and use it in GitHub Desktop.
This file contains 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 = 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