diff --git a/config.toml b/config.toml
index 02d5036..78deec5 100644
--- a/config.toml
+++ b/config.toml
@@ -19,6 +19,11 @@ repo_path = "git/gitmessage"
 system_path = "~/.gitmessage"
 type = "file"
 
+[tools.git.ignore]
+repo_path = "git/gitignore"
+system_path = "~/.gitignore"
+type = "file"
+
 [tools.tmux]
 repo_path = "tmux/tmux.conf"
 system_path = "~/.tmux.conf"
diff --git a/git/gitconfig b/git/gitconfig
index ec20e7e..bec7b00 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -9,3 +9,14 @@
 	tool = nvimdiff
 [gpg]
 	program = gpg
+[push]
+	autoSetupRemote = true
+[rebase]
+	autosquash = true
+	updateRefs = true
+	rebaseMerges = true
+	autoStash = true
+	rescheduleFailedExec = true
+	backend = merge
+[core]
+	excludesFile = ~/.gitignore
diff --git a/git/gitignore b/git/gitignore
new file mode 100644
index 0000000..95ef7c6
--- /dev/null
+++ b/git/gitignore
@@ -0,0 +1 @@
+*.orig