nanorc: update to newer version

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 8edb1270a4844cc8eed31c39f09ebe35e2cd6f6e..3a0dc3ecc4b3a10f8443b3fc90607c20a97ad6c3 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,6 +3,9 @@
        email = vapier@gentoo.org
 #      signingkey = 0xE837F581
 
+[advice]
+       detachedHead = false
+
 [core]
        abbrev = 12
        pager = less -FRMX --tabs 4 -#10
@@ -23,6 +26,9 @@
 [diff]
        renames = true
 
+[fetch]
+       parallel = 4
+
 # Settings used by Chromium's `git cl`.  The defaults are brain-dead.
 [gerrit]
        skip-ensure-authenticated = true
@@ -52,13 +58,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
@@ -66,6 +77,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
@@ -76,8 +88,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