.gitconfig: better colors for light bg

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 4afa96f5abf39ad57581b71e76c6bad9061e4397..3a8714224789be7bf96eba8ca9e85a78bc12f05f 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -7,10 +7,73 @@
        l5 = log -5
        lb = log --decorate --graph --stat --pretty=beautiful
        lb5 = log --decorate --graph --stat --pretty=beautiful -5
-       st = status
+       st = status -s
 
 [pretty]
-       beautiful = format:'%C(blue)%h%Creset (%ar - %C(green)%aN <%aE>%C(reset))%n%B%n'
+       beautiful = format:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n
+
+[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 = red
+#      -- light bg --
+       current = blue
+       local = normal
+       plain = normal
+       remote = magenta
+       upstream = normal
+[color "diff"]
+#      -- default --
+#      commit = yellow
+#      frag = cyan
+#      meta = bold
+#      new = green
+#      old = red
+#      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 = red
+#      changed = red
+#      header = normal
+#      nobranch = red
+#      untracked = red
+#      updated = green
+#      -- light bg --
+       added = blue
+       changed = blue
+       header = normal
+       nobranch = red
+       untracked = red
+       updated = magenta
 
 [core]
        pager = less -FRSXgimq
@@ -23,6 +86,9 @@
 # 3 way diffs
 #      cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
 
+[receive]
+       denyNonFastForwards = true
+
 [web]
        browser = webbrowser