cros-board: update

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 61f69994a51fa3033adfeaee13aba1c2b83cccf3..833f6da45ae7ad02cbf146ce69104b334b4b02ec 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,6 +3,10 @@
        email = vapier@gentoo.org
 #      signingkey = 0xE837F581
 
+[advice]
+       detachedHead = false
+       skippedCherryPicks = false
+
 [core]
        abbrev = 12
        pager = less -FRMX --tabs 4 -#10
@@ -23,6 +27,9 @@
 [diff]
        renames = true
 
+[fetch]
+       parallel = 4
+
 # Settings used by Chromium's `git cl`.  The defaults are brain-dead.
 [gerrit]
        skip-ensure-authenticated = true
@@ -37,6 +44,9 @@
        # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
        version = 2
 
+[pull]
+       ff = only
+
 [push]
        default = current
 
@@ -49,12 +59,18 @@
        bi   = bisect
        cfg  = config
        ci   = commit
+       cia  = commit -a
+       ciaf = commit -a --fixup
+       ciam = commit --amend
+       ciaam = commit --amend -a
+       cif  = commit --fixup
        co   = checkout
        cp   = cherry-pick --ff
        cp-a = cherry-pick --abort
        cp-c = cherry-pick --continue
        cp-x = cherry-pick -x
        d    = diff
+       dc   = diff --cached
        desc = describe
        f    = fetch
        fp   = format-patch -C -M
@@ -62,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
@@ -72,8 +89,9 @@
        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'
 
 [tag]
        sort = version:refname
@@ -87,6 +105,9 @@
 [http]
        cookiefile = ~/.gitcookies
 
+[submodule]
+       fetchJobs = 4
+
 [transfer]
        # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
        fsckobjects = true
@@ -103,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 =