My .gitconfig

.gitconfig

[user]
	name = Adi Roiban
	email = adi.roiban@chevah.com

[alias]
    ae = !"~/.local/opt/Sublime\\ Text\\ 2/sublime_text" ~/.gitconfig
    st = status -s
    ci = commit -a
    cis = commit
    push = push --tags
    b = branch
    db = branch -d
    dr = push origin --delete
    rb = branch -m
    co = checkout
    sb = checkout
    cb = checkout -b
    gb = !sh -c 'git checkout -b $1 origin/$1' -
    cl = clone
    di = diff
    gd = difftool
    lg = log --graph --all --format=format:'%C(bold blue)%h%C(reset) %C(white)%s%C(reset) %C(bold white)%an%C(reset)%C(bold yellow)%d%C(reset)' --abbrev-commit
    info = remote show origin
    undo = reset --soft HEAD~
    clear = checkout -- .
    top = log --pretty=format:'%h %an %ad %s' --date=short -10
    slog = log --pretty=format:'%h %an %ad %s' --date=short
    tip = log -1
    pick = cherry-pick
    difflog = log --graph --left-right --cherry-pick --oneline master..
    alias = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
    bn = !git for-each-ref --format='%(refname:short)' $(git symbolic-ref HEAD)
    publish = !BRANCH_NAME=$(git bn) && git push --set-upstream origin $BRANCH_NAME
    m = merge --no-commit --no-ff
    lm = log --merges --first-parent --pretty=format:'%h %an %ad %s' --date=short
    conflicts = "!git ls-files -u | cut -f 2 | sort -u"
    lc = log --name-status --oneline master..HEAD
    commiters = shortlog -s
    download = archive --format=tar
    conflicts = !git ls-files -u | cut -f 2 | sort -u
    unmerge = reset --merge
    sync = !git publish && git push --all && git push --tags

[diff]
	tool = meld

[difftool "bc3"]
    cmd = /home/adi/.local/bin/bcompare-diff

[push]
	default = upstream

[core]
	pager = cat
	excludesfile = /home/adi/.git/ignore


[merge]
	tool = bc3

[mergetool "bc3"]
	path = bcompare

[mergetool]
	bc3 = trustExitCode