My gitconfig

.gitconfig

[user]
	name = Dave Hall
	email = [email protected]
	signingkey = GPG-KEY-FINGERPRINT # follow these instructions to setup https://andrewmatveychuk.com/how-to-sign-you-commits-with-gpg-git-and-yubikey/

[core]
	editor = vim # no debate
	excludesfile = ~/.gitignore_global # Generated using https://www.gitignore.io/api/diff,patch,go,vim,macos,python,pycharm,webstorm,archives,phpstorm,drupal,node

[commit]
	verbose = true # It gives me more info if I mess something up
	gpgsign = true # I always sign my commits

[diff]
	tool = Kaleidoscope # If you're on mac this is worth the money - https://kaleidoscope.app

[fetch]
	prune = true # Removes remote branches were merged - keeps things tidy

[merge]
	conflictstyle = diff3 # Three way diff makes it easier to see what's happened when resolving conflicts
	ff = only # Fast forwarding avoids merge conflicts #cleanHistory
	tool = Kaleidoscope # If you want to resolve conflicts visually

[pager]
	color = true # Pretty colors!

[pull]
	rebase = true # Rebase your changes on top of the remote changes - #cleanHistory

[push]
	default = simple # Push the current branch to the remote with the same name

# The next four sections are only needed if you're using Kaleidoscope on macOS for visual diff and merge
[mergetool "Kaleidoscope"]
	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
	trustexitcode = true

[difftool "Kaleidoscope"]
	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"

[difftool]
	prompt = false

[mergetool]
	prompt = false


[init]
	defaultBranch = main # New repos use main as the default branch