.gitconfig

.gitconfig

[user]
	name = Evgenii.S.Semenchuk
	email = [email protected]
[core]
	#editor = subl -w
[merge]
	tool = diffmerge
[color]
	diff = auto
	status = auto
	branch = auto
        interactive = auto
[alias]
      st = status
      ci = commit
      ciw = commit -am "[WIP]"
      cil = commit -a --amend --no-edit
      unwip = reset --soft 'HEAD^'
      br = branch
      cbr = checkout -b
      dbr = branch -D
      mbr = branch -m
      co = checkout
      df = diff
      lg = log -p
      olg = log --oneline
      slg = log --pretty=short
      mlg = log --pretty=medium
      flg = log --pretty=full
      fflg = log --pretty=fuller
      who = shortlog -s --
      chmsg = commit --amend
      up = pull origin
      cdiff = diff --cached
      lpatch = format-patch -n1
      mpatch = format-patch -M

[difftool "diffmerge"]
	cmd = diffmerge "$LOCAL" "$REMOTE"
[mergetool "diffmerge"]
	cmd = diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
	trustExitCode = true

[push]
	default = current