.gitconfig: remove alias ca to avoid collision with commit -a

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index d6a5853a1836268a6d374b70a275d41ca9ca7c61..67b48341f734b8633413765cad4202d4964b5afa 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,20 +1,24 @@
 [alias]
        b = branch
+       camend = commit --amend -C HEAD
        checkin = commit
        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
+       d = diff
+       dc = diff --cached
+       l = log --decorate
+       l1 = log --decorate --oneline
+       l5 = log --decorate -5
        lg = log --decorate --graph
        lg1 = log --decorate --graph --oneline
        lg5 = log --decorate --graph -5
-       st = status -s
-       stb = status -sb
-
-[pretty]
-       beautiful = format:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n
+       lr = log --decorate --reverse
+       lr1 = log --decorate --reverse --oneline
+       lr5 = log --decorate --reverse -5
+       st = status --short
+       stb = status --short --branch
+       wdiff = diff --word-diff
+       wshow = show --word-diff
 
 [color]
        ui = auto