[user] name = Anton Bobov email = abobov@gmail.com [http] sslVerify = false [color] ui = auto [diff] tool = vimdiff [difftool] prompt = false [grep] lineNumber = true [merge] tool = vimdiff stat = true [core] pager = less -+$LESS -FRX excludesfile = ~/.gitignore [log] decorate = short [alias] aa = add --all --intent-to-add ar = !sh -c 'git archive --format=tar --prefix="$(basename "$PWD")-$1/" $1^{tree} | bzip2 >"$(basename "$PWD")-$1.tar.bz2"' - br = branch --sort=-committerdate c = commit --verbose co = checkout ci = commit diffstat = diff --stat -r fix = commit --amend -C HEAD history-all = "!gitk --all $( git fsck | awk '/dangling commit/ {print $3}'; git log -g --pretty='format:%H')" k = !sh -c 'gitk $1' - ka = !sh -c 'gitk --all' - kb = !sh -c 'gitk --branches' - lg = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative l = "!git lg -10" f = !sh -c 'git branch | grep -F "feature/$1" | xargs -r -n 1 git co' - st = status stashlist = stash list --date=short addnw = !sh -c 'git diff --unified=0 --ignore-all-space --no-color "$@" | git apply --cached --ignore-whitespace --unidiff-zero -' branch-name = "!git rev-parse --abbrev-ref HEAD" publish = "!git push -u origin $(git branch-name)" [advice] statusHints = false [branch] autosetupmerge = always autosetuprebase = local [rebase] instructionFormat = %s [%an] {%ar} [rerere] enabled = true [status] submoduleSummary = true [help] autocorrect = 10 [credential] helper = netrc [remote-hg] hg-git-compat = true [filter "tabs"] ;clean = unexpand --tabs=4 --first-only [gui] tabsize = 2 [pull] rebase = true [guitool "meld"] cmd = meld $FILENAME noconsole = yes needsfile = yes [guitool "gvim"] cmd = gvim $FILENAME noconsole = yes needsfile = yes [include] path = .gitconfig.local [includeIf "gitdir:~/src/rusgis/**"] path = ~/.gitconfig-rusgis