My .gitconfig

.gitconfig

[branch]
	autoSetupRebase = always
[merge]
	defaultToUpstream = true
	log = true
[pull]
	rebase = true
[push]
	default = upstream
	autoSetupRemote = true
[user]
	name = Aron Adler
	email = [email protected]
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
[alias]
	st = status
	fa = fetch --all
	plf = pull --ff-only
	p = push
	pf = push --force-with-lease
	done = "!git checkout develop && git plf"
	upd = fetch -u origin develop:develop # updates develop branch
	fapd = "!git fa && git upd"
	fapl = "!git fa && git plf"
	red = rebase develop # rebases current branch onto develop
	updt = fetch -u origin test-release:test-release
	updm = fetch -u origin master:master
	ca = commit --amend
	co = checkout
	cod = checkout develop
	nb = checkout -b
	stash-staged = "!git stash --keep-index -u -m \"unstageds temporary\" && git stash push -u -m \"stageds only\" && git stash pop stash@{1}"
	mff = merge --ff-only
[rerere]
	enabled = true