.gitconfig: fix a bug in alias

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 701610db32b76078193d0c5241965cef3b2cfb0e..3ec2ca05f54a90d0bb9b19030895b8c06467c29b 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,19 +1,45 @@
 [alias]
        b = branch
+       branches = branch -a
+       camend = commit --amend -C HEAD
        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
-
-[core]
-       pager = less -FRSXgimq
+       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
+       null-merge = merge --strategy=ours
+       remotes = remote -v
+       ri = "!sh -c 'git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u\\}\"}' -"
+       #root = !pwd
+       root = rev-parse --show-toplevel
+       st = status --short
+       stb = status --short --branch
+       tags = tag -l
+       unstage = reset HEAD --
+       wdiff = diff --word-diff
+       wshow = show --word-diff --decorate
+
+[branch]
+       autosetuprebase = always
+
+[color]
+       ui = auto
+
+[include]
+       path = ~/lib/config/git/light_bg
+
+[log]
+       abbrevCommit = true
 
 [merge]
        tool = vimdiff