diff --git a/.git-commit-message b/.git-commit-message
new file mode 100644
index 0000000..8765b68
--- /dev/null
+++ b/.git-commit-message
@@ -0,0 +1,5 @@
+<type>[optional scope]: <description>
+
+[optional body]
+
+[optional footer(s)]
diff --git a/.gitconfig b/.gitconfig
index 2e834a8..fd9a216 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -15,3 +15,5 @@
 	remotereset = reset --hard @{u}
 [credential]
 	helper = osxkeychain
+[commit]
+	template = /Users/conner/.git-commit-message
diff --git a/.gitignore b/.gitignore
index ad033ce..9371029 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 !config/*
 !bin/*
 !bin
+!.git-commit-message