Add .hushlogin, show /etc/motd in .profile if it was changed

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index afedc4ff177e17cf95bbfca51d07cb49745d161c..d5535a102d2c0301c94cfb601bf39b770bcbd437 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
@@ -18,8 +18,12 @@
        lr5 = log --decorate --reverse -5
        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
@@ -87,6 +91,9 @@
 [core]
        pager = less -FRSXgimq
 
+[log]
+       abbrevCommit = true
+
 [merge]
        tool = vimdiff