gitconfig

[alias]
	ci = commit
	co = checkout
	di = diff --color-words
	br = branch
	move   = mv
	ren    = mv
	rename = mv
	up     = pull --rebase
	update = pull --rebase
	svnup     = !git stash && git svn rebase && git stash apply
	svnpull     = !git stash && git svn rebase && git stash apply
	svnpush     = !git stash && git svn dcommit && git stash apply
	svnupdate = !git stash && git svn rebase && git stash apply
	st   = status
	stat = status
	del    = rm
	delete = rm
	remove = rm
	export = archive
	ann    = blame
	praise = blame
	cat  = show
	list = show
	ls   = show
	type = cat-file -t
	dump = cat-file -p

	untrack-ignored = !git-untracked-ignored
	info = !git-info
	amend = commit --amend -C HEAD
	fixup = "!f() { \
		if git merge-base --is-ancestor HEAD $(git rev-parse @{u} 2>/dev/null || echo origin/main); then \
			git commit --message=fixup $@ ; \
		else \
			git commit --amend --reuse-message=HEAD $@ ; \
		fi; \
	}; f"
	tree = log --graph --pretty=oneline
	hist = log --graph --pretty=format:'%C(cyan)%h%Creset -%C(yellow)%d%Creset %s %C(magenta)[%an]%Creset %Cgreen(%ad)%Creset' --date=relative

	vimdiff = difftool -y -t vimdiff
[color]
	diff = auto
	status = auto
	branch = auto
[core]
	pager =
	excludesfile = ~/.gitignore
	safecrlf = true
[push]
	default = upstream
[include]
	# Add private configurations (eg github tokens) to the .gitprivate file
	# This requires (at minimum) git 1.7.10
	path = .gitprivate
[init]
	defaultBranch = main