.gitconfig

[user]
	email = [email protected]
	name = Edvard Majakari
[alias]
  bl = blame
  br = branch
  ci = commit
  cl = clone
  co = checkout
  cp = cherry-pick
  di = diff
  gr = grep
  ol = log --pretty=oneline
  pu = pull
  st = status
  fp = format-patch
  lc = log ORIG_HEAD.. --stat --no-merges
  mas = checkout master
  ify = !git init && echo '*~' >> .gitignore && git add . && git ci -m 'initial rev'
  sync = !git pull --rebase && git push
  sortdiff = !sh -c 'git diff "$@" | grep "^[+-]" | sort --key=1.2 | uniq -u -s1'
  gviz =  "!f() { echo 'digraph git {' ; git log --pretty='format:  %h -> { %p }' \"$@\" | sed 's/[0-9a-f][0-9a-f]*/\"&\"/g' ; echo '}'; }; f"
	pl = pull --ff-only
[color]
  ui = auto
  diff = auto
  interactive = auto
  status = auto
  branch = auto
  grep = auto

[color "branch"]
  current = yellow reverse
  local = yellow
  remote = green
[color "diff"]
  meta = white bold
  frag = magenta bold
  old = red bold
  new = green bold
  whitespace = red reverse
[color "status"]
  added = green
  changed = yellow
  untracked = red

[core]
  whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
[merge]
	tool = diffmerge
[github]
	user = EdvardM
[branch "master"]
	remote = origin
	merge = refs/heads/master
[mergetool "diffmerge"]
	cmd = diffmerge --merge\n--result=$MERGED $LOCAL $BASE $REMOTE
	trustExitCode = true
[diff]
	tool = diffmerge
[difftool]
	prompt = false
[difftool "diffmerge"]
	cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
[push]
	default = current