Do not set default tab width and related

[max/dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index c9dc7150a0db980581ef699f331717205fd0a623..c4866f35ee1d5c8b038274f7e2bfda04abb5d2d4 100644 (file)
--- 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