cros-board: update

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 92850e79ba2f53b4a12d69de671dc2d331f99ecb..833f6da45ae7ad02cbf146ce69104b334b4b02ec 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,6 +5,7 @@
 
 [advice]
        detachedHead = false
+       skippedCherryPicks = false
 
 [core]
        abbrev = 12
@@ -77,6 +78,7 @@
        h    = help
        l    = log
        lf   = log --format= --name-only
+       lp   = log -p
        m    = merge --log=100 --no-stat
        rb   = rebase
        rb-d = rebase --committer-date-is-author-date
@@ -87,7 +89,7 @@
        rl   = rev-list
        se   = send-email -C -M
        sm   = submodule
-       st   = status
+       st   = status -s
        t    = tag
        vl   = log --pretty='format:%Cred%h%Creset %Cgreen%ai%Creset %s%C(bold)%C(yellow)%d%Creset'
 
@@ -103,6 +105,9 @@
 [http]
        cookiefile = ~/.gitcookies
 
+[submodule]
+       fetchJobs = 4
+
 [transfer]
        # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
        fsckobjects = true
@@ -119,7 +124,12 @@
        confirm = always
        suppressfrom = true
        suppresscc = author
-       smtpserver = localhost:1111
        transferEncoding = 8bit
 #      composeencoding = utf-8
        assume8bitEncoding = 8bit
+
+       sendmailcmd = ssh dev /usr/sbin/sendmail
+#      smtpEncryption = tls
+#      smtpServer = smtp.gentoo.org
+#      smtpUser = vapier
+#      smtpPass =