.bash_profile: Register id_ed25519 SSH key with ssh-agent, if present
[dotfiles.git] / .gitconfig
index 30a3de5982fc0eb3a02c5e0428457bc6f2b80417..9cb3982584153ec0558231b0e615ec2a849680fe 100644 (file)
        out          = !git-outgoing
        # Branch helpers
        bd           = !git-branch-dates
-       bv           = !git branch --color -vv
+       bv           = !git-branch-dates -v
        cv           = !git-cherry-view
        # Diff helpers
-       df           = diff --patience
-       dfc          = diff --patience --cached
-       dfw          = diff --patience --word-diff=plain
+       df           = diff
+       dfc          = diff --cached
+       dfw          = diff --word-diff=color
+       dfcw         = diff --cached --word-diff=color
        # Searching
        ls           = ls-files
        ack          = !git-ack
        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 = ~/.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
@@ -53,6 +61,7 @@
        ui = auto
 
 [color "diff"]
+       plain = 241
        meta = blue bold
        frag = magenta bold
        old = red bold
        changed = green bold
        untracked = blue bold
 
+[color "diff-highlight"]
+       oldNormal = nobold
+       oldHighlight = red bold 235
+       newNormal = nobold
+       newHighlight = green bold black
+
+[pull]
+       rebase = false
+       ff = only
+
 [push]
        default = matching
+
+[include]
+       path = .gitconfig.local