X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=git%2F.gitconfig;h=c4866f35ee1d5c8b038274f7e2bfda04abb5d2d4;hb=8be605a7ab0fa1defe6f91a977e8e81400dd8047;hp=c9dc7150a0db980581ef699f331717205fd0a623;hpb=d67cb7a54710bb17a2009b3fe4c69371f2f73b25;p=max%2Fdotfiles.git

diff --git a/git/.gitconfig b/git/.gitconfig
index c9dc715..c4866f3 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,20 +3,22 @@
 	branch = always
 	status = always
 	interactive = always
-	diff = always
+	diff = true
 [user]
 	name = Maximilian Friedersdorff
-	email = maxf130@gmail.com
+	email = max@friedersdorff.com
+        signingkey = F5E7FCB3
 [core]
 	editor = vim
 	excludesfile = /home/max/.gitignore
 [merge]
 	tool = diffuse
+        ff = true
 [push]
 	default = simple
 [alias]
-	lg = log --graph --pretty=format:'%Cred%h%Creset %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short
-	hist = log --graph --full-history --all --pretty=format:'%Cred%h%Creset %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short
+	lg = log --graph --pretty=format:'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short
+	hist = log --graph --full-history --all --pretty=format:'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short
         struct = log --graph --full-history --all --pretty=format:'%ad %s %Creset %C(yellow)%d%Creset' --date=short --simplify-by-decoration
 	co = checkout
 	ci = commit