.gitconfig: remove core.pager and pass -FRSX in env

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index f911284ae96a107d131194bbf73e391511e0bddf..4a411ea5a43ba005fcdb3111908a3989f7d2e440 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,16 +1,29 @@
 [alias]
        b = branch
+       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
+       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
 
-[pretty]
-       beautiful = format:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n
+[branch]
+       autosetuprebase = always
 
 [color]
        ui = auto
@@ -31,7 +44,7 @@
        upstream = normal
 [color "diff"]
 #      -- default --
-#      commit = yellow
+#      commit = bold yellow
 #      frag = cyan
 #      meta = cyan
 #      new = green
@@ -75,8 +88,8 @@
        untracked = red
        updated = magenta
 
-[core]
-       pager = less -FRSXgimq
+[log]
+       abbrevCommit = true
 
 [merge]
        tool = vimdiff