diff --git a/git/config b/git/config
new file mode 100644
index 0000000..4d22f1e
--- /dev/null
+++ b/git/config
@@ -0,0 +1,17 @@
+#==========================#
+# Global Git Configuration #
+#==========================#
+[config]
+relativePaths=false			# Show relative paths with status outputs
+[init]
+defaultBranch=main			# Default branch is 'main' not 'master'
+[diff]
+algorithm=histogram			# Better-sorted output of diffs
+[merge]
+conflictstyle=diff3			# Use the diff3 merge output
+[user]					# Default credentials:
+name="Bill Niblock"			# My name
+email="bill@theinternetvagabond.com"	# My email address
+[includeIf "gitdir:~/Code/nibtech/"]	# Over-ride with NibTech credentials
+path="~/.config/git/nibtech.conf"	# Path to NibTech config file
+# another thing!
diff --git a/git/gitconfig b/git/gitconfig
deleted file mode 100644
index eab9b1a..0000000
--- a/git/gitconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-#============================#
-# gitconfig file for niblock #
-#============================#
-
-# General Settings:
-#    Show me absolute paths, not relative paths
-#    Link to a global excludes file
-[status]
-    relativePaths = false
-
-[core]
-    excludesFile = ~/.gitignore
diff --git a/git/gitignore b/git/gitignore
deleted file mode 100644
index 2344896..0000000
--- a/git/gitignore
+++ /dev/null
@@ -1,40 +0,0 @@
-# Global gitignore file
-# Stolen from octocat: https://gist.github.com/octocat/9257657
-
-# Compiled source #
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-
-# Packages #
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-
-# Logs and databases #
-*.log
-*.sql
-*.sqlite
-
-# OS generated files #
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db 
-
-# Vim Related #
-*.swp
-.netrwhist
-*.un~
-tags
diff --git a/git/nibtech.conf b/git/nibtech.conf
new file mode 100644
index 0000000..0ee869e
--- /dev/null
+++ b/git/nibtech.conf
@@ -0,0 +1,7 @@
+#===========================#
+# NibTech Git Configuration #
+#===========================#
+[user]				# NibTech Credentials:
+name="Bill Niblock"		# My name
+email="bill@niblock.tech"	# My email address
+