work's gitconfig

.gitconfig

[alias]
    s = status -sb
    d = diff
    dc = diff --cached
    p = push
    pff = push -f
    pa = push --all && push --tags
    pl = pull
    pb = "!git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)"
    c = commit -a
    cp = cherry-pick
    co = checkout
    ec = config --global -e
    up = !git pull --rebase --prune $@ && git submodule update --init --recursive
    rc = rebase --continue
    ra = rebase --abort
    cob = checkout -b
    cm = !git add -A && git commit -m
    save = !git add -A && git commit -m 'SAVEPOINT'
    wip = !git add -u && git commit -m "WIP"
    undo = reset HEAD~1 --mixed
    amend = commit -a --amend
    wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
    bclean = "!f() { git branch --merged ${1-master} | grep -v " ${1-master}$" | xargs -r git branch -d; }; f"
    bdone = "!f() { git checkout ${1-master} && git up && git bclean ${1-master}; }; f"
    currb = rev-parse --abbrev-ref HEAD

[user]
	email = sashasimkin@gmail.com
	name = "Alex Simkin"

[includeIf "gitdir:~/Projects/tradecore/"]
	path = ~/.gitconfig-tradecore

[fetch]
	prune = true
	prunetags = true

[branch]
	sort = -committerdate

[commit]
	verbose = true

[push]
	autoSetupRemote = true
	default = simple
[pull]
        rebase = true
[rebase]
	# git commit --fixup OLD_COMMIT_ID for this to work
	autosquash = true
	autostash = true

[rerere]
	# Reuse Recovered Resolution
	enabled = true

[core]
	autocrlf = input
        editor = vi
	excludesFile = ~/.gitignore-global
[color]
	ui = auto

[status]
	submoduleSummary = true

[merge]
	conflictstyle = diff3

[diff]
	submodule = log
	algorithm = histogram

#[diff "sopsdiffer"]
#	textconv = sops -d

.gitconfig-tradecore

[user]
email = alex.simkin@tradecore.com