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

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 9320ab50958f4bea8af24a26647972f47e19b96a..d5535a102d2c0301c94cfb601bf39b770bcbd437 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,15 +1,29 @@
 [alias]
        b = branch
+       camend = commit --amend -C HEAD
        checkin = commit
        ci = commit
        co = checkout
-       l1 = log --oneline
-       l5 = log -5
+       d = diff
+       dc = diff --cached
+       dshow = show --decorate
+       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
+       unstage = reset HEAD --
+       wdiff = diff --word-diff
+       wshow = show --word-diff --decorate
+
+[branch]
+       autosetuprebase = always
 
 [color]
        ui = auto
@@ -77,6 +91,9 @@
 [core]
        pager = less -FRSXgimq
 
+[log]
+       abbrevCommit = true
+
 [merge]
        tool = vimdiff