gitconfig: Add alias for stash pop (sp).

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index fc38d37a9c1ac4b1d12ae1ed6f8d066ecd529b8e..766831a53605971fd0bab8cd729471edab53123d 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -107,6 +107,7 @@ include(../lib.m4)
        sl  = stash list
        ss  = stash save
        sa  = stash apply
+       sp  = stash pop
        ssk = stash save --keep-index
 
        ## Custom commands.
@@ -118,6 +119,16 @@ include(../lib.m4)
        # Detect copies and renames.
        renames = copy
 
+       # 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
+       # ([^a-zA-Z0-9_]), therefore changes to words are shown in complete
+       # (e.g. from "word" to "newword" as "[-word-]{+newword+}"), but
+       # changes to non-word characters are shown character wise (e.g. from
+       # "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
+       # addition. See t/ for some tests and examples.
+       wordregex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
+
 # Allow diffing of some binary files.
 # `pdftotext-` is a wrapper around pdftotext which writes to stdout.
 # `sqlite3dump` is a wrapper calling `sqlite3 database-file .dump`.
@@ -141,4 +152,9 @@ FI
        # replies to the first one.
        thread = shallow
 
+[receive]
+       # Automatically fsck objects when receiving them (respected by git
+       # receive-pack and git fetch (>= 1.7.8, for fetch)).
+       fsckobjects = true
+
 # vim: ft=gitconfig noet