[user] name = Sami Samhuri email = sami@samhuri.net [alias] lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative co = checkout b = branch d = diff lo = log --oneline a = add c = commit g = grep --break --heading --line-number [push] default = upstream [branch] autosetupmerge = true [core] quotepath = false whitespace = trailing-space,space-before-tab excludesfile = ~/config/gitignore [diff] mnemonicprefix = true renames = copies compactionHeuristic = true [advice] statusHints = false pushNonFastForward = false [color] ui = auto [merge] stat = true [rebase] autosquash = true [difftool] prompt = false [difftool "FileMerge"] cmd = opendiff \"$LOCAL\" \"$REMOTE\" [credential] helper = osxkeychain [difftool "sourcetree"] cmd = opendiff \"$LOCAL\" \"$REMOTE\" path = [grep] extendRegexp = true lineNumber = true [filter "media"] required = true clean = git media clean %f smudge = git media smudge %f [filter "hawser"] clean = git hawser clean %f smudge = git hawser smudge %f required = true [merge "mergepbx"] name = XCode project files merger driver = mergepbx %O %A %B [transfer] fsckobjects = true [submodule] fetchJobs = 4 [commit] gpgsign = true