.profile: remove PROMPT_COMMAND, set titles from PS1

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index c16415a947a8760147054b0b1f3e3bbecfabbcf0..17c893cb8649d011724a991c10eedfdf20e45625 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,11 +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
@@ -85,8 +90,8 @@
        untracked = red
        updated = magenta
 
-[core]
-       pager = less -FRSXgimq
+[log]
+       abbrevCommit = true
 
 [merge]
        tool = vimdiff