Skip to content

Instantly share code, notes, and snippets.

@kennethreitz
Created January 3, 2015 02:56
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save kennethreitz/05166e5901439068b520 to your computer and use it in GitHub Desktop.
Save kennethreitz/05166e5901439068b520 to your computer and use it in GitHub Desktop.
[alias]
switch = !legit switch \"$@\"
branches = !legit branches
sprout = !legit sprout \"$@\"
unpublish = !legit unpublish \"$@\"
harvest = !legit harvest \"$@\"
sync = !legit sync \"$@\"
publish = !legit publish \"$@\"
graft = !legit graft \"$@\"
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
st = status -sb
[user]
name = Kenneth Reitz
email = me@kennethreitz.com
[credential]
helper = osxkeychain
[color]
ui = true
[core]
excludesfile = /Users/kreitz/.global_ignore
[merge]
tool = Kaleidoscope
[mergetool "extMerge"]
cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[mergetool]
trustExitCode = false
prompt = false
[diff]
external = extDiff
tool = Kaleidoscope
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[mergetool "Kaleidoscope"]
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment