dotfiles/vcs/git/gitconfig

58 lines
1.5 KiB
Plaintext
Raw Normal View History

2010-06-25 14:11:53 +10:00
[alias]
2011-11-08 17:54:51 +11:00
co = checkout
put = push origin HEAD
push-all = "!for i in $(git config --list | grep -E ^remote\\..+\\.url | sed -E 's/^remote\\.(.*)\\.url=.*/\\1/'); do git push $i master; done"
unadd = reset HEAD
ctags = !.git/hooks/ctags
2012-12-05 11:55:49 +11:00
latest = for-each-ref --sort=-committerdate --format='%(committerdate:relative) -> %(refname:short)'
2013-03-10 16:42:47 +11:00
switch = !legit switch \"$@\"
branches = !legit branches
sprout = !legit sprout \"$@\"
unpublish = !legit unpublish \"$@\"
harvest = !legit harvest \"$@\"
sync = !legit sync \"$@\"
publish = !legit publish \"$@\"
graft = !legit graft \"$@\"
2010-06-25 14:11:53 +10:00
[apply]
2011-11-08 17:54:51 +11:00
whitespace = nowarn
2010-06-25 14:11:53 +10:00
[color]
2011-11-08 17:54:51 +11:00
branch = auto
diff = auto
status = auto
ui = auto
2010-06-25 14:11:53 +10:00
[core]
2011-11-08 17:54:51 +11:00
attributesfile = ~/.gitattributes
excludesfile = ~/.gitignore
whitespace = fix
2010-06-25 14:11:53 +10:00
[branch]
2011-11-08 17:54:51 +11:00
autosetupmerge = always
autosetuprebase = local
2010-06-25 14:11:53 +10:00
[diff "ruby"]
2011-11-08 17:54:51 +11:00
funcname = ^ *\\(\\(class\\|module\\|def\\) .*\\)
2011-09-20 06:12:35 +10:00
[github]
2011-11-08 17:54:51 +11:00
user = bjeanes
[init]
templatedir = ~/.git_template
[rerere]
enabled = 1
2012-08-17 06:57:02 +10:00
[include]
path = .gitconfig.github
path = .gitconfig.pushurls
path = .gitconfig.merge
2012-08-17 06:57:02 +10:00
path = .gitconfig.local
2012-10-23 15:31:31 +11:00
[credential]
helper = osxkeychain
2012-11-24 10:36:53 +11:00
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
2013-03-10 16:43:00 +11:00
trustExitCode = true
2012-11-24 10:36:53 +11:00
[mergetool]
prompt = false
[merge]
tool = Kaleidoscope