X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vcs%2Fgitconfig.in;h=1c26d07abe99a03dab65b0ec9d7f2ea45cb0464a;hb=90c7d8c82c272860729299d3fad7f2bbabae20b4;hp=98702c725c92539c5120cbc5a70a6615581d48e0;hpb=c8e829da0ee22b31ac9de44d49f01c2f5b8a3ae9;p=config%2Fdotfiles.git

diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in
index 98702c7..1c26d07 100644
--- a/vcs/gitconfig.in
+++ b/vcs/gitconfig.in
@@ -1,6 +1,6 @@
 # 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
@@ -62,7 +62,7 @@
 	## 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
@@ -125,9 +125,9 @@
 	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
 
@@ -141,8 +141,8 @@
 	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"
 
@@ -188,16 +188,18 @@
 	# 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).
@@ -236,6 +238,11 @@
 	# 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