.gitconfig: add 'root' aliases

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index afedc4ff177e17cf95bbfca51d07cb49745d161c..17c893cb8649d011724a991c10eedfdf20e45625 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,12 +1,12 @@
 [alias]
-       amend = commit --amend -C HEAD
        b = branch
-       ca = commit --amend
+       camend = commit --amend -C HEAD
        checkin = commit
        ci = commit
        co = checkout
        d = diff
        dc = diff --cached
+       dshow = show --decorate
        l = log --decorate
        l1 = log --decorate --oneline
        l5 = log --decorate -5
@@ -16,10 +16,16 @@
        lr = log --decorate --reverse
        lr1 = log --decorate --reverse --oneline
        lr5 = log --decorate --reverse -5
+       root = rev-parse --show-toplevel
+       #root = !pwd
        st = status --short
        stb = status --short --branch
+       unstage = reset HEAD --
        wdiff = diff --word-diff
-       wshow = show --word-diff
+       wshow = show --word-diff --decorate
+
+[branch]
+       autosetuprebase = always
 
 [color]
        ui = auto
@@ -84,8 +90,8 @@
        untracked = red
        updated = magenta
 
-[core]
-       pager = less -FRSXgimq
+[log]
+       abbrevCommit = true
 
 [merge]
        tool = vimdiff