.vimrc: airline: Use plain ascii symbols
[dotfiles.git] / .gitconfig
index a802e5686164af2e81c80ac6144e0e90bb7d8958..30a3de5982fc0eb3a02c5e0428457bc6f2b80417 100644 (file)
@@ -3,37 +3,36 @@
        email = tony@nynim.org
 
 [alias]
-       browse       = !hub browse
-       w            = !hub browse
-       compare      = !hub compare
-       cb           = !git-cut-branch
-       sh           = !git-sh
-       grab         = !github-grab
-       thanks       = !git-thanks
-       track        = !git-track
-       root         = rev-parse --show-toplevel
-       ll           = log -16 --pretty='format:%C(yellow)%h%Creset %s%C(green bold)%d%Creset %C(black bold)(by %an, %ar)%Creset'
-       lll          = 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'
-       review       = log -p --max-count=1
-       fp           = format-patch --stdout
+       # Simple aliases
        ci           = commit
-       st           = status
+       st           = status -sb
        br           = branch
        co           = checkout
-       cv           = !git-cv
-       lg           = log -p
-       who          = shortlog -s --
-       bd           = !git-brdate
-       bv           = !git branch --color -v | cut -c1-100
-       incoming     = !git-incoming
+       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
-       outgoing     = !git-outgoing
        out          = !git-outgoing
-       subtree      = !git-subtree
-       sup          = !git-subup
+       # Branch helpers
+       bd           = !git-branch-dates
+       bv           = !git branch --color -vv
+       cv           = !git-cherry-view
+       # Diff helpers
        df           = diff --patience
-       di           = diff --patience --cached
+       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
 [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