Last active
February 11, 2016 18:04
-
-
Save alex-arriaga/3fadc996b5a7528f8b5d 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] | |
excludesfile = /Users/alex/.gitignore_global | |
[difftool "sourcetree"] | |
cmd = /usr/local/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\" | |
path = | |
[mergetool "sourcetree"] | |
cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot | |
trustExitCode = true | |
[user] | |
name = Alex Arriaga | |
email = [email protected] | |
[filter "lfs"] | |
clean = git-lfs clean %f | |
smudge = git-lfs smudge %f | |
required = true | |
[mergetool "Kaleidoscope"] | |
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot | |
trustexitcode = true | |
[merge] | |
tool = Kaleidoscope | |
[difftool "Kaleidoscope"] | |
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" | |
[difftool] | |
prompt = false | |
[mergetool] | |
prompt = false | |
[diff] | |
tool = Kaleidoscope | |
[http] | |
sslVerify = true | |
[alias] | |
co = checkout | |
ci = commit | |
st = status | |
br = branch | |
hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit -- | |
lo = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short | |
ln = log --name-status | |
type = cat-file -t | |
dump = cat-file -p |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment