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

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 14b5b731bbf64bf50f75929c11dff77a3cfec89b..67b48341f734b8633413765cad4202d4964b5afa 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,18 +1,24 @@
 [alias]
-       amend = commit --amend -C HEAD
        b = branch
+       camend = commit --amend -C HEAD
        checkin = commit
-       ca = commit --amend
        ci = commit
        co = checkout
        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
+       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