.vim/bundle: Update vim bundle submodules
[dotfiles.git] / .gitconfig
index 4723821977bb59570bd8287cd037d3c4211defbd..30a3de5982fc0eb3a02c5e0428457bc6f2b80417 100644 (file)
@@ -3,25 +3,42 @@
        email = tony@nynim.org
 
 [alias]
-       sh     = !git-sh
-       grab   = !githug-grab
-       thanks = !git-thanks
-       cv     = !git-cv
-       track  = !git-track
-       ll = log --pretty=oneline --abbrev-commit --max-count=15
-       review = log -p --max-count=1
-       fp = format-patch --stdout
-       ci = commit
-       st = status
-       br = branch
-       co = checkout
-       df = diff
-       lg = log -p
-       who = shortlog -s --
+       # Simple aliases
+       ci           = commit
+       st           = status -sb
+       br           = branch
+       co           = checkout
+       tags         = tag -n1 -l
+       # Log helpers
+       ll           = log --pretty='format:%C(yellow)%h%Creset %s%C(green bold)%d%Creset %C(black bold)(by %an, %ar)%Creset'
+       graph        = log --all --graph --topo-order --pretty='format:%C(yellow)%h%Creset %s %C(black bold)(by %an)%Creset%C(green bold)%d%Creset%n'
+       # Remote helpers
+       in           = !git-incoming
+       out          = !git-outgoing
+       # Branch helpers
+       bd           = !git-branch-dates
+       bv           = !git branch --color -vv
+       cv           = !git-cherry-view
+       # Diff helpers
+       df           = diff --patience
+       dfc          = diff --patience --cached
+       dfw          = diff --patience --word-diff=plain
+       # Searching
+       ls           = ls-files
+       ack          = !git-ack
+       # Submodules
+       sub          = !git-subup
+       sup          = !git-subup pull
+       # Misc
+       root         = rev-parse --show-toplevel
+       who          = shortlog -s --
+       fp           = format-patch --stdout
 
 [core]
        filemode = true
+       logallrefupdates = true
        whitespace = space-before-tab, trailing-space
+       excludesfile = ~/.gitignore_global
 
 [diff]
        renames = copies
 [color "branch"]
        current = yellow reverse
        local = yellow bold
-       remote = green bold
+       remote = green
        plain = red bold
 
+[color "decorate"]
+       branch = green bold
+       remoteBranch = green
+
 [color "status"]
        added = yellow
        changed = green bold
        untracked = blue bold
 
+[push]
+       default = matching