gitconfig: add ld alias to describe commits

[config/dotfiles.git] / gitconfig.in

diff --git a/gitconfig.in b/gitconfig.in
index 99ffe299d42d532c77424d72a9f6f34c88eb985f..9fd76ba7af18af483ad9134f5d91665e96c91999 100644 (file)
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -1,6 +1,6 @@
 # Global Git configuration file.
 
-# Copyright (C) 2011-2015  Simon Ruderich
+# Copyright (C) 2011-2017  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -79,6 +79,7 @@
        ls  = log --stat
        lp  = log --patch
        lpw = log --patch --color-words
+       ld  = show --date=short -s --pretty='format:%h (\"%s\", %ad)' # describe
        a   = add
        ap  = add --patch
        au  = add --update
@@ -97,6 +98,7 @@
        re  = rebase
        rei = rebase --interactive
        rec = rebase --continue
+       cp  = cherry-pick
        ## Submodules.
        sm  = submodule
        ## Remote.
@@ -172,6 +174,13 @@
        # Diff algorithm to use.
        algorithm = histogram
 
+       # Highlight moved code in a different color.
+       colorMoved = zebra
+
+       # Replace "a/" and "b/" prefix in diffs with characters describing the
+       # context (e.g. "i/"ndex and "w/"ork tree).
+       mnemonicprefix = true
+
        # Change the definition of a word as used by diff --color-words to be
        # shorter (not only spaces) and thus simplify the generated diffs.
        # Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
@@ -184,15 +193,14 @@
 
 # Allow diffing of some binary files.
 #
-# "sh -c '..' -" is used when the programs require additional arguments. The
-# last "-" is argv[0] which is passed to sh, the real arguments are passed
-# after "-" by git.
+# "sh -c '..' ARGV0" is used when the programs require additional arguments
+# which are passed after ARGV0 by git.
 [diff "gzip"]
        textconv = gzip -d -c
 [diff "pdf"]
-       textconv = sh -c 'exec pdftotext "$@" -' -
+       textconv = sh -c 'exec pdftotext "$@" -' ARGV0
 [diff "sqlite"]
-       textconv = sh -c 'exec sqlite3 "$@" .dump' -
+       textconv = sh -c 'exec sqlite3 "$@" .dump' ARGV0
 
 [log]
        # Display branches/tag names in log (same as log's --decorate option).
@@ -222,4 +230,11 @@
        # receive-pack and git fetch (>= 1.7.8, for fetch)).
        fsckObjects = yes
 
+
+# NON-GIT SETTINGS
+
+[annex]
+       # My SSH config already uses ControlMaster where appropriate.
+       sshcaching = false
+
 # vim: ft=gitconfig