[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
-
-[pretty]
- beautiful = format:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n
+ d = diff
+ dc = diff --cached
+ 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
+ wdiff = diff --word-diff
+ wshow = show --word-diff
[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
+# remote = magenta
# -- light bg --
current = blue
+ local = normal
+ plain = normal
remote = magenta
+ upstream = normal
[color "diff"]
# -- default --
-# commit = yellow
+# commit = bold yellow
# frag = cyan
-# meta = bold
+# meta = cyan
# new = green
-# old = red
+# old = magenta
# plain = normal
# whitespace = normal red
# -- light bg --
commit = normal bold
- frag = green
+ 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
# prompt = normal
[color "status"]
# -- default --
-# added = red
-# changed = red
+# added = cyan
+# changed = magenta
# header = normal
# nobranch = red
# untracked = red
# -- light bg --
added = blue
changed = blue
+ header = normal
+ nobranch = red
+ untracked = red
updated = magenta
[core]