diff --git a/.gitconfig b/.gitconfig
index cab402d..8189d3a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,10 +1,10 @@
 [user]
 	name = stanislas
 	email = stanislas@jouf.fr
+
 [init]
 	defaultBranch = main
-[color]
-	ui = auto
+
 [alias]
 	cg = config --global
 	aliases = !git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'
@@ -25,5 +25,45 @@
 	cima = commit -a -m
 	br = branch
 	bra = branch -a
+
+[fetch]
+  prune = true
+  pruneTags = True
+  all = true
 [pull]
 	rebase = true
+[push]
+  autoSetupRemote = true
+  followTags = true
+[commit]
+  verbose = true
+[rebase]
+  autoStash = true
+  updateRefs = true
+
+[color]
+	ui = auto
+[column]
+  ui = auto
+
+[branch]
+  sort = -committerdate
+[tag]
+  sort = version:refname
+[diff]
+  algorithm = histogram
+  colorMoved = plain
+  mnemonicPrefix = true
+  renames = true
+[help]
+  autocorrect = prompt
+
+[rerere]
+  enabled = true
+  autoupdate = true
+
+[core]
+  excludesfile = ~/.gitignore
+	editor = vi
+ 
+