Skip to content

Instantly share code, notes, and snippets.

@xhacker
Last active August 29, 2015 14:06
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 xhacker/471f54e029a181cadf3f to your computer and use it in GitHub Desktop.
Save xhacker/471f54e029a181cadf3f to your computer and use it in GitHub Desktop.
.gitconfig
[user]
name = Xhacker Liu
email = liu.dongyuan@gmail.com
[core]
editor = nano
excludesfile = /Users/xhacker/.gitignore_global
quotepath = false
pager = less -x4
[credential]
helper = osxkeychain
[diff]
algorithm = patience
tool = Kaleidoscope
[alias]
ignore = update-index --assume-unchanged
unignore = update-index --no-assume-unchanged
ignored = !git ls-files -v | grep "^[[:lower:]]"
co = checkout
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
remove-untracked-files = clean -f -d
reset-all = !git reset --hard && git remove-untracked-files
[push]
default = simple
[help]
autocorrect = 1
[color]
ui = on
[branch]
autosetuprebase = always
[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
[mergetool]
prompt = false
[merge]
tool = Kaleidoscope
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment