# Global Git configuration file.
-# Copyright (C) 2011-2017 Simon Ruderich
+# Copyright (C) 2011-2018 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
- # Global gitattributes file. Thanks to canton7 in #git on Freenode
- # (2011-11-09 13:23 CET).
- attributesfile = PWD/gitattributes
[pager]
# Use pager for the following commands.
## Local.
c = commit --verbose
ca = commit --verbose --amend
- cad = commit --verbose --amend --date=
+ cad = commit --verbose --amend --date=now
d = diff
dw = diff --color-words
ds = diff --stat
ls = log --stat
lp = log --patch
lpw = log --patch --color-words
- ld = show --date=short -s --pretty='format:%h (\"%s\", %ad)' # describe
+ ld = show --date=short --no-patch --pretty='format:%h (\"%s\", %ad)' # describe
a = add
ap = add --patch
au = add --update
fg = ! git fs && git gc --aggressive 2>&1 # fsck and compress repo
## Misc.
sl = stash list
- ss = stash save
- ssk = stash save --keep-index
- ssu = stash save --include-untracked
+ ss = stash push
+ ssk = stash push --keep-index
+ ssu = stash push --include-untracked
sa = stash apply --index
sp = stash pop --index
tig = ! PWD/bin/tig.pl
# Create backup of uncommitted and untracked changes.
- ssb = "! git stash save --include-untracked \
- \"Backup on $(LANG=C date '+%a, %d %b %Y %H:%M:%S %z')\" \
+ ssb = "! git stash push --include-untracked \
+ -m \"Backup on $(LANG=C date '+%a, %d %b %Y %H:%M:%S %z')\" \
>/dev/null \
&& git stash apply >/dev/null"
# addition. See t/ for some tests and examples.
wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
-# Allow diffing of some binary files.
+# Rules to allow diffing of some binary files. Disabled by default to prevent
+# programs from running them on arbitrary files via a .local .gitattributes
+# file. Copy them to .git/config of the repository to enable them.
#
# "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 "$@" -' ARGV0
-[diff "sqlite"]
- textconv = sh -c 'exec sqlite3 "$@" .dump' ARGV0
+#[diff "gzip"]
+# textconv = gzip -d -c
+#[diff "pdf"]
+# textconv = sh -c 'exec pdftotext "$@" -' ARGV0
+#[diff "sqlite"]
+# textconv = sh -c 'exec sqlite3 "$@" .dump' ARGV0
[log]
# Display branches/tag names in log (same as log's --decorate option).
# Disable annoying advice messages.
waitingForEditor = false
+[init]
+ # Don't create .git/hooks with any sample hooks. Reduces the clutter
+ # in new git repositories.
+ templateDir =
+
# NON-GIT SETTINGS