gitconfig: Remove noet from Vim's modeline.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 439f7808977f5864c0beb026fa27115b6faf0bd4..ff77b2bfb88d64be82926b8dfab179cb1073a728 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -1,6 +1,6 @@
 # Global Git configuration file.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2013  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
@@ -42,20 +42,25 @@ include(../lib.m4)
 
 [core]
        editor = vim
-       # Can't use ~/ because of older git versions.
-       excludesfile = GITIGNORE
 
 # Use pager for the following commands.
 [pager]
        status = yes
        tag = yes
 
+[interactive]
+       # Don't require <Return> in interactive commands which require only a
+       # single key, for example `git add --patch`.
+       singlekey = yes
+
 [alias]
        ## Shortcuts for often used commands.
        #
        ## Local.
        c   = commit --verbose
        ci  = commit --verbose
+       ca  = commit --verbose --amend
+       cad = commit --verbose --amend --date=
        d   = diff PATIENCE
        di  = diff PATIENCE
        dw  = diff PATIENCE --color-words
@@ -66,6 +71,7 @@ include(../lib.m4)
        l   = log
        ls  = log --stat
        lp  = log --patch PATIENCE
+       lpw = log --patch PATIENCE --color-words
        a   = add
        ap  = add --patch
        au  = add --update
@@ -106,27 +112,66 @@ include(../lib.m4)
        ## Misc.
        sl  = stash list
        ss  = stash save
-       sa  = stash apply
        ssk = stash save --keep-index
+       sa  = stash apply
+       sp  = stash pop
 
        ## Custom commands.
        #
-       # tig-like log view.
-       glog = log --pretty=oneline --graph --all
+       # tig-like log view. Similar to the following but with author/date
+       # information. --pretty=format is not used because it doesn't allow
+       # precise enough control over formats and colors.
+       #
+       # tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
+       tig = ! PWD/bin/tig.pl
+
+       # Create backup of uncommitted and untracked changes.
+       ssb = "! git stash save --include-untracked \
+                               \"Backup on $(date -R)\" >/dev/null \
+             && git stash apply >/dev/null"
+
+       # Display list and content of untracked files. Untracked directories
+       # and symbolic links are only listed.
+       u = "! git ls-files --other --exclude-standard --directory -z \
+            | xargs -0 sh -c '\
+                  for x; do \
+                      printf \"\\033[1;33m-> %s\\033[0m:\" \"$x\"; \
+                      if test -d \"$x\"; then \
+                          echo \" directory\"; \
+                      elif test -h \"$x\"; then \
+                          echo \" symbolic link\"; \
+                      else \
+                          echo; \
+                          cat \"$x\"; \
+                      fi; \
+                      echo; \
+                  done' argv0 \
+            | less"
 
 [diff]
        # 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`.
 [diff "gzip"]
        textconv = gzip -d -c
 [diff "pdf"]
-       textconv = pdftotext-
+       textconv = PWD/bin/pdftotext-
 [diff "sqlite"]
-       textconv = sqlite3dump
+       textconv = PWD/bin/sqlite3dump
 
 [merge]
 IF(OS, darwin)
@@ -141,9 +186,9 @@ FI
        # replies to the first one.
        thread = shallow
 
-[receive]
+[transfer]
        # 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
+# vim: ft=gitconfig