diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..518bf19
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+gitconfiguser
diff --git a/gitconfig b/gitconfig
index 030c321..5dd9a3b 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,6 +1,4 @@
-[user]
-	name = darkelfe14728
-	email = jul.rosset@gmail.com
+# vim: syntax=gitconfig
 [color]
 	diff = auto
 	status = auto
@@ -17,14 +15,16 @@
 	brsa = "!f() { git push ${2-$(git config --get custom.serverbranch.remote)} ${2-$(git config --get custom.serverbranch.remote)}/${3-$(git config --get custom.serverbranch.branch)}:refs/heads/${1}; }; f"
 	brsd = "!f() { git push ${2-$(git config --get custom.serverbranch.remote)} :heads/${1}; }; f"
 	link = branch --track
-	lo = log --pretty=format:'%Cred%h%Creset %C(bold blue)<%an>%Creset - %Cgreen%cr%Creset - %s' --abbrev-commit
-	ls = log --pretty=format:'%Cred%h%Creset %C(bold blue)<%an>%Creset - %Cgreen%cr%Creset - %s' --abbrev-commit --stat
-	ln = log --pretty=format:'%Cred%h%Creset %C(bold blue)<%an>%Creset - %Cgreen%cr%Creset - %s' --abbrev-commit -n
-	lns = log --pretty=format:'%Cred%h%Creset %C(bold blue)<%an>%Creset - %Cgreen%cr%Creset - %s' --abbrev-commit --stat -n
+	lo = log --date=format-local:'%d/%m/%Y %H:%M:%S' --pretty=format:'%Cred%h%Creset %C(bold blue)<%an>%Creset - %Cgreen%cr%Creset - %cd - %s' --abbrev-commit
+	ls = lo --stat
+	ln = lo -n
+	lns = ls -n
 	uf = checkout --
 	cb = checkout
-	push = push --tags
 	untrack = rm --cached
+	tg = "!f() { git tag -a $1 -m \"${2-$1}\" }; f"
+	pu = "f() { git push && git push --tags }; f"
+	sm = "!f() { git pull && git merge ${2-$(git config --get custom.serverbranch.remote)}/${1} && git push; }; f"
 [core]
 	editor = vim
 	autocrlf = false
@@ -41,3 +41,5 @@
 	tool = vimdiff
 [difftool]
 	prompt = false
+[include]
+	path = gitconfiguser