PS1.sh: make it a bit more readable and support android target info

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 9dcfea20b5bed429fe9b5da7ea44b42f974559c6..4be988b20d40096d904fc1f09020fbf79be45675 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,9 @@
 [user]
        name = Mike Frysinger
        email = vapier@gentoo.org
+#      signingkey = 0xE837F581
+[core]
+       abbrev = 12
 [color]
        ui = auto
        diff = auto
@@ -12,6 +15,8 @@
        frag = yellow bold
        whitespace = normal green
        meta = magenta
+[diff]
+       renames = true
 [push]
        default = current
 [alias]
@@ -36,7 +41,8 @@
        h    = help
        l    = log
        m    = merge
-       rb   = rebase --committer-date-is-author-date
+       rb   = rebase
+       rb-d = rebase --committer-date-is-author-date
        rb-a = rebase --abort
        rb-c = rebase --continue
        rb-i = rebase --interactive
@@ -47,10 +53,15 @@
        st   = status
        t    = tag
        up   = upload
+[tag]
+       sort = version:refname
 [merge]
        conflictstyle = diff3
 [rebase]
        autosquash = true
+[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
@@ -58,4 +69,5 @@
        chainreplyto = false
        confirm = always
        suppressfrom = true
+       suppresscc = author
        smtpserver = localhost:1111