Last active
December 21, 2016 20:12
-
-
Save AlexVKO/08d239b0d0d695382a7167751b362c73 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
[core] | |
autocrlf = input | |
excludesfile = /Users/alexvko/.gitignore | |
editor = vim | |
pager = diff-so-fancy | less --tabs=4 -RFX | |
[heroku] | |
[push] | |
default = simple | |
[difftool "ksdiff"] | |
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" | |
path = | |
[mergetool "ksdiff"] | |
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot | |
trustExitCode = true | |
[filter "media"] | |
clean = git-media-clean %f | |
smudge = git-media-smudge %f | |
[merge] | |
tool = p4mergetool | |
[mergetool "intellij"] | |
cmd = idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED") | |
trustExitCode = true | |
[diff] | |
tool = sourcetree | |
[difftool "intellij"] | |
cmd = idea diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") | |
[mergetool] | |
keepBackup = false | |
[alias] | |
unreleased = "!git log $(git describe --abbrev=0 --tags)..origin/master --no-merges" | |
pull-rebase = pull --rebase origin master | |
slog = log --oneline --decorate --graph --all --date=relative | |
ls = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short | |
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat | |
assume = update-index --assume-unchanged | |
unassume = update-index --no-assume-unchanged | |
assumed = "!git ls-files -v | grep ^h | cut -c 3-" | |
unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged" | |
assumeall = "!git st -s | awk {'print $2'} | xargs git assume" | |
publish = "!git push -u origin $(git symbolic-ref --short HEAD)" | |
unpublish = "!git push origin :$(git symbolic-ref --short HEAD)" | |
amend = commit -a --amend --no-edit | |
save = commit -am 'Savepoint: Will squash' | |
review = difftool origin/develop... | |
[filter "hawser"] | |
clean = git hawser clean %f | |
smudge = git hawser smudge %f | |
required = true | |
[credential] | |
helper = osxkeychain | |
[filter "lfs"] | |
clean = git-lfs clean %f | |
smudge = git-lfs smudge %f | |
required = true | |
[color "diff-highlight"] | |
oldNormal = red bold | |
oldHighlight = red bold 52 | |
newNormal = green bold | |
newHighlight = green bold 22 | |
[mergetool "p4mergetool"] | |
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED | |
trustExitCode = false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment