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

diff --git a/git/.gitconfig b/git/.gitconfig
index 2ac5251..c4866f3 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,21 +3,22 @@
 	branch = always
 	status = always
 	interactive = always
-	diff = always
+	diff = true
 [user]
 	name = Maximilian Friedersdorff
 	email = max@friedersdorff.com
+        signingkey = F5E7FCB3
 [core]
-	editor = emc
+	editor = vim
 	excludesfile = /home/max/.gitignore
 [merge]
 	tool = diffuse
-        ff = false
+        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