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

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 4afa96f5abf39ad57581b71e76c6bad9061e4397..4a411ea5a43ba005fcdb3111908a3989f7d2e440 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,19 +1,95 @@
 [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
+       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:'%C(blue)%h%Creset (%ar - %C(green)%aN <%aE>%C(reset))%n%B%n'
+[branch]
+       autosetuprebase = always
 
-[core]
-       pager = less -FRSXgimq
+[color]
+       ui = auto
+
+# Adapted from http://shallowsky.com/blog/programming/gitcolors.html
+# and http://www.ansdb.com/649-git-colors-for-light-background
+[color "branch"]
+#      -- default --
+#      current = green
+#      local = normal
+#      plain = normal
+#      remote = magenta
+#      -- light bg --
+       current = blue
+       local = normal
+       plain = normal
+       remote = magenta
+       upstream = normal
+[color "diff"]
+#      -- default --
+#      commit = bold yellow
+#      frag = cyan
+#      meta = cyan
+#      new = green
+#      old = magenta
+#      plain = normal
+#      whitespace = normal red
+#      -- light bg --
+       commit = normal bold
+       frag = cyan
+       meta = bold
+       new = blue
+       old = magenta
+       plain = normal
+       whitespace = normal red
+#[color "grep"]
+#      -- default --
+#      match = normal
+[color "decorate"]
+#      -- light bg --
+       HEAD = blue
+       tag = blue
+#[color "interactive"]
+#      -- default --
+#      error = normal
+#      header = normal
+#      help = normal
+#      prompt = normal
+[color "status"]
+#      -- default --
+#      added = cyan
+#      changed = magenta
+#      header = normal
+#      nobranch = red
+#      untracked = red
+#      updated = green
+#      -- light bg --
+       added = blue
+       changed = blue
+       header = normal
+       nobranch = red
+       untracked = red
+       updated = magenta
+
+[log]
+       abbrevCommit = true
 
 [merge]
        tool = vimdiff
@@ -23,6 +99,9 @@
 # 3 way diffs
 #      cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
 
+[receive]
+       denyNonFastForwards = true
+
 [web]
        browser = webbrowser