git-log: include tag/branch names

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 27b66941dcb0c0e332e05efe1848e4ecf43093c6..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,25 +15,34 @@
        frag = yellow bold
        whitespace = normal green
        meta = magenta
+[diff]
+       renames = true
 [push]
        default = current
 [alias]
        a    = add
        ab   = abandon
        ar   = archive
-       b    = branch
+       b    = branch -v
        bi   = bisect
        cfg  = config
        ci   = commit
        co   = checkout
-       cp   = cherry-pick
+       cp   = cherry-pick --ff
+       cp-a = cherry-pick --abort
+       cp-c = cherry-pick --continue
+       cp-x = cherry-pick -x
        d    = diff
+       desc = describe
        dl   = download
        f    = fetch
-       fp   = format-patch
+       fp   = format-patch -C -M
+       g    = grep
+       h    = help
        l    = log
        m    = merge
        rb   = rebase
+       rb-d = rebase --committer-date-is-author-date
        rb-a = rebase --abort
        rb-c = rebase --continue
        rb-i = rebase --interactive
@@ -41,11 +53,21 @@
        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
 [sendemail]
        chainreplyto = false
+       confirm = always
        suppressfrom = true
+       suppresscc = author
        smtpserver = localhost:1111