[user] name = Anton Bobov email = abobov@gmail.com [color] ui = auto [diff] tool = vimdiff [difftool] prompt = false [merge] tool = vimdiff stat = true [core] pager = less -+$LESS -FRX excludesfile = ~/.gitignore [alias] diffstat = diff --stat -r co = checkout ci = commit lg = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative st = status k = !sh -c 'gitk $1' - ka = !sh -c 'gitk --all' - kb = !sh -c 'gitk --branches' - fix = commit --amend -C HEAD ar = !sh -c 'git archive --format=tar --prefix="$(basename "$PWD")-$1/" $1^{tree} | bzip2 >"$(basename "$PWD")-$1.tar.bz2"' - history-all = "!gitk --all $( git fsck | awk '/dangling commit/ {print $3}'; git log -g --pretty='format:%H')" [push] default = matching [advice] statusHints = false [branch] autosetupmerge = always autosetuprebase = local [help] autocorrect = 10 [credential] helper = cache [remote-hg] hg-git-compat = true