PS1: shorten slightly & add PS0 recovery

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 820f8f1b0b6db41407264935e84231039bda1906..b3201a925db28b5845bf0ac0c97440dbb6ded26a 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,10 +1,17 @@
 [user]
        name = Mike Frysinger
        email = vapier@gentoo.org
+#      signingkey = 0xE837F581
+
+[core]
+       abbrev = 12
+       pager = less -FRMX --tabs 4 -#10
+
 [color]
        ui = auto
        diff = auto
        status = auto
+
 [color "diff"]
        old = red bold
        new = green bold
@@ -12,7 +19,85 @@
        frag = yellow bold
        whitespace = normal green
        meta = magenta
+
+[diff]
+       renames = true
+
+# Settings used by Chromium's `git cl`.  The defaults are brain-dead.
+[gerrit]
+       skip-ensure-authenticated = true
+       squash-uploads = false
+
+#[pager]
+#      diff = diff-highlight | less
+#      log  = diff-highlight | less
+#      show = diff-highlight | less
+
+[protocol]
+       # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
+       version = 2
+
+[push]
+       default = current
+
+[alias]
+       a    = add
+       am-a = am --abort
+       am-c = am --continue
+       ar   = archive
+       b    = branch -v
+       bi   = bisect
+       cfg  = config
+       ci   = commit
+       co   = checkout
+       cp   = cherry-pick --ff
+       cp-a = cherry-pick --abort
+       cp-c = cherry-pick --continue
+       cp-x = cherry-pick -x
+       d    = diff
+       desc = describe
+       f    = fetch
+       fp   = format-patch -C -M
+       g    = grep
+       h    = help
+       l    = log
+       lf   = log --format= --name-only
+       m    = merge --log=100 --no-stat
+       rb   = rebase
+       rb-d = rebase --committer-date-is-author-date
+       rb-a = rebase --abort
+       rb-c = rebase --continue
+       rb-i = rebase --interactive
+       rb-s = rebase --skip
+       rl   = rev-list
+       se   = send-email -C -M
+       sm   = submodule
+       st   = status
+       t    = tag
+
+[tag]
+       sort = version:refname
+
+[merge]
+       conflictstyle = diff3
+
+[rebase]
+       autosquash = true
+
+[http]
+       cookiefile = ~/.gitcookies
+
+[transfer]
+       # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
+       fsckobjects = true
+
+[merge "merge-changelog"]
+       name = GNU-style ChangeLog merge driver
+       driver = /usr/bin/git-merge-changelog %O %A %B
+
 [sendemail]
+       chainreplyto = false
+       confirm = always
        suppressfrom = true
+       suppresscc = author
        smtpserver = localhost:1111
-#      smtpserver = zeus.spd.analog.com