You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
|
|
|
|
[include]
|
|
|
|
|
path = .gitconfig.user
|
|
|
|
|
|
|
|
|
|
[core]
|
|
|
|
|
excludesfile = ~/.gitignore
|
|
|
|
|
editor = mvim -f
|
|
|
|
|
autocrlf = input
|
|
|
|
|
eol = lf
|
|
|
|
|
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
|
|
|
|
|
|
|
|
|
|
[color]
|
|
|
|
|
ui = auto
|
|
|
|
|
[color "branch"]
|
|
|
|
|
current = yellow reverse
|
|
|
|
|
local = yellow
|
|
|
|
|
remote = green
|
|
|
|
|
[color "diff"]
|
|
|
|
|
meta = yellow bold
|
|
|
|
|
frag = magenta bold
|
|
|
|
|
old = red bold
|
|
|
|
|
new = green bold
|
|
|
|
|
whitespace = red reverse
|
|
|
|
|
[color "status"]
|
|
|
|
|
added = yellow
|
|
|
|
|
changed = green
|
|
|
|
|
untracked = cyan
|
|
|
|
|
|
|
|
|
|
[alias]
|
|
|
|
|
st = status
|
|
|
|
|
cm = commit
|
|
|
|
|
co = checkout
|
|
|
|
|
br = branch
|
|
|
|
|
ps = push
|
|
|
|
|
pl = pull
|
|
|
|
|
hub = push origin master
|
|
|
|
|
subup = submodule foreach git pull
|
|
|
|
|
rs = reset master --hard
|
|
|
|
|
hist = log --pretty=format:\"%h | %ad | %s%d [%an]\" --graph --date=local
|
|
|
|
|
lo = log --graph --decorate --pretty=oneline --abbrev-commit --all
|
|
|
|
|
type = cat-file -t
|
|
|
|
|
dump = cat-file -p
|
|
|
|
|
|
|
|
|
|
[merge]
|
|
|
|
|
tool = sourcetree
|
|
|
|
|
summary = true
|
|
|
|
|
[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
|
