2 files changed, 81 insertions, 0 deletions
diff --git a/common/git/.gitconfig b/common/git/.gitconfig
new file mode 100644
index 0000000..ea494ad
--- /dev/null
+++ b/common/git/.gitconfig
@@ -0,0 +1,52 @@
+# This is Git's per-user configuration file.
+[user]
+	name = Christian Cleberg
+	email = [email protected]
+	signingkey = [email protected]
+[core]
+	excludesfile = ~/.gitignore_global
+	editor = emacs
+	autocrlf = input
+	untrackedCache = true
+
+[alias]
+	# Quick status and logs
+	st = status
+	co = checkout
+	br = branch
+	# A beautiful, readable graph log
+	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
+	# Undo the last commit but keep changes
+	uncommit = reset --soft HEAD~1
+	# Clean up merged branches
+	trim = !git branch --merged | grep -v '*' | xargs -n 1 git branch -d
+
+[color]
+	ui = auto
+
+[init]
+	defaultBranch = main
+
+[push]
+	# Push to the current branch by default
+	default = current
+	# Automatically setup remote tracking on first push
+	autoSetupRemote = true
+
+[pull]
+	# Avoid creating unnecessary merge commits when pulling
+	rebase = true
+
+[rebase]
+	# Automatically stash changes before rebasing and pop after
+	autoStash = true
+
+[diff]
+	# Use an algorithmic approach that produces more readable diffs
+	algorithm = histogram
+	# Detect renames better
+	renames = true
+
+[help]
+	# Correct typos automatically (0.5 second delay)
+	autocorrect = 5
diff --git a/common/git/.gitignore_global b/common/git/.gitignore_global
new file mode 100644
index 0000000..5abac3e
--- /dev/null
+++ b/common/git/.gitignore_global
@@ -0,0 +1,29 @@
+# macOS
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Editors
+*.swp
+*.swo
+*~
+.vscode/
+.idea/
+
+# Common logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*