.gitconfig: add diff aliases

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index f911284ae96a107d131194bbf73e391511e0bddf..14b5b731bbf64bf50f75929c11dff77a3cfec89b 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,16 +1,18 @@
 [alias]
+       amend = commit --amend -C HEAD
        b = branch
        checkin = commit
+       ca = commit --amend
        ci = commit
        co = checkout
-       l1 = log --oneline
-       l5 = log -5
-       lb = log --decorate --graph --stat --pretty=beautiful
-       lb5 = log --decorate --graph --stat --pretty=beautiful -5
-       st = status -s
-
-[pretty]
-       beautiful = format:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n
+       d = diff
+       dc = diff --cached
+       lg = log --decorate --graph
+       lg1 = log --decorate --graph --oneline
+       lg5 = log --decorate --graph -5
+       st = status --short
+       stb = status --short --branch
+       wdiff = diff --word-diff
 
 [color]
        ui = auto
@@ -31,7 +33,7 @@
        upstream = normal
 [color "diff"]
 #      -- default --
-#      commit = yellow
+#      commit = bold yellow
 #      frag = cyan
 #      meta = cyan
 #      new = green