.gitglobalconfig

[core]
	excludesfile = ~/.gitignore_global
	editor = mate -w
[push]
	default = current
[alias]
	cam = commit -a -m
	undo = reset --hard
	f = fetch
	fp = fetch -p --progress
	st = status --short --branch
	s = status --short --branch
	ci = commit
	br = branch
	co = checkout
	cb = checkout -b
	df = diff
	lg = log -p
	lol = log --graph --decorate --pretty=oneline --abbrev-commit
	lola = log --graph --decorate --pretty=oneline --abbrev-commit --all --date=local
	ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
	ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
	acpf=!git add . && git commit --amend --no-edit && git push origin $branch --force-with-lease

[pull]
	rebase = true
[merge]
    tool = intellij
[mergetool "intellij"]
    cmd = idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
    trustExitCode = true
[diff]
    tool = intellij
[difftool "intellij"]
    cmd = idea diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
[mergetool]
	keepBackup = false
[difftool]
	prompt = false