.shellrc: set TERM=rxvt-unicode for tmux

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index e2f097e96aa542936879ac7029733dffe2515a40..afedc4ff177e17cf95bbfca51d07cb49745d161c 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,16 +1,25 @@
 [alias]
+       amend = commit --amend -C HEAD
        b = branch
+       ca = commit --amend
        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
-       st = status -s
-
-[pretty]
-       beautiful = format:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n
+       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