# 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
[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.
#
## 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 = ! TIG | 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"]
# 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