ssh: add agent forwarding for negadon

[smckown/dotfiles.git] / gitconfig

diff --git a/gitconfig b/gitconfig
index 0f4f4e61e9b9a48c3ff209aeafc9d15bcf56f8ba..c2bdd41688768aad960604e4e69713b92a48e992 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -8,16 +8,19 @@
 [log]
        decorate = true
 [diff]
-        ; diff.tool kdiff3 useful for 'git diffall'
+       ; diff.tool kdiff3 useful for 'git diffall'
        tool = kdiff3
        mnemonicprefix = true
 [difftool]
        prompt = false
 [merge]
        tool = vimdiff
+       conflictstyle = diff3
 [mergetool]
        prompt = false
 [push]
        default = simple
 [branch]
        autosetuprebase = always
+[heads]
+       dfltargs = -a -b --author-date-order \"--format=format:%C(auto)%ad %h%d\"