.vim: vim-plug @b6050d6
[dotfiles.git] / .gitconfig
index e020642ecef973e562b78acd611b52b10848c3cb..b783b86cae0d80749bb2c831efd9839a24e93bd1 100644 (file)
@@ -3,29 +3,53 @@
        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 --
-       brdate = !git-brdate
+       # 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-dates -v
+       cv           = !git-cherry-view
+       # Diff helpers
+       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
+       who          = shortlog -s --
+       fp           = format-patch --stdout
+       patch        = !git --no-pager diff --no-color
 
 [core]
        filemode = true
+       logallrefupdates = true
        whitespace = space-before-tab, trailing-space
+       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
@@ -37,6 +61,7 @@
        ui = auto
 
 [color "diff"]
+       plain = 241
        meta = blue bold
        frag = magenta bold
        old = red bold
 [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
 
+[color "diff-highlight"]
+       oldNormal = nobold
+       oldHighlight = red bold 235
+       newNormal = nobold
+       newHighlight = green bold black
+
+[push]
+       default = matching
+
+[include]
+       path = .gitconfig.local