.vimrc: Updates to airline_symbols
[dotfiles.git] / .gitconfig
index 06ca5617046ad36fde840435be681482048954ea..b783b86cae0d80749bb2c831efd9839a24e93bd1 100644 (file)
        co           = checkout
        tags         = tag -n1 -l
        # Log helpers
-       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'
+       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
-       track        = !git-track
-       incoming     = !git-incoming
        in           = !git-incoming
-       outgoing     = !git-outgoing
        out          = !git-outgoing
        # Branch helpers
-       bd           = !git-brdate
-       bv           = !git branch --color -vv
-       cv           = !git-cv
-       subtree      = !git-subtree
+       bd           = !git-branch-dates
+       bv           = !git-branch-dates -v
+       cv           = !git-cherry-view
        # Diff helpers
-       df           = diff --patience
-       dfc          = diff --patience --cached
+       df           = diff
+       dfc          = diff --cached
+       dfw          = diff --word-diff=color
+       dfcw         = diff --cached --word-diff=color
+       # Searching
+       ls           = ls-files
+       ack          = !git-ack
+       # Submodules
+       sub          = !git-subup
+       sup          = !git-subup pull
        # Misc
        root         = rev-parse --show-toplevel
-       sh           = !git-sh
-       thanks       = !git-thanks
        who          = shortlog -s --
-       sup          = !git-subup
        fp           = format-patch --stdout
+       patch        = !git --no-pager diff --no-color
 
 [core]
        filemode = true
        logallrefupdates = true
        whitespace = space-before-tab, trailing-space
-       excludesfile = ~/.gitignore_global
+       excludesfile = ~/.gitfiles/gitignore-global
+       attributesfile = ~/.gitfiles/gitattributes-global
+       pager = diff-pager
+
+[interactive]
+       diffFilter = diff-filter
 
 [diff]
        renames = copies
+       algorithm  = patience
 
 [sendemail]
        smtpserver = smtp.gmail.com
@@ -54,6 +61,7 @@
        ui = auto
 
 [color "diff"]
+       plain = 241
        meta = blue bold
        frag = magenta bold
        old = red bold
        remote = green
        plain = red bold
 
+[color "decorate"]
+       branch = green bold
+       remoteBranch = green
+
 [color "status"]
        added = yellow
        changed = green bold
        untracked = blue bold
 
+[color "diff-highlight"]
+       oldNormal = nobold
+       oldHighlight = red bold 235
+       newNormal = nobold
+       newHighlight = green bold black
+
 [push]
        default = matching
+
+[include]
+       path = .gitconfig.local