X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=vcs%2Fgitconfig.in;h=3d3afced140e378df75a71c99417c4d37a937425;hp=50d88a9191c495a5cddd5f3d645e929c3983a6e9;hb=4fc2ad6c2abc2b857d52d14ac948d21e96390ab3;hpb=f7a8615b16edb9065f10f89560c995e05c823cc5

diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in
index 50d88a9..3d3afce 100644
--- a/vcs/gitconfig.in
+++ b/vcs/gitconfig.in
@@ -44,9 +44,6 @@
 
 [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.
@@ -128,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
 
@@ -144,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"
 
@@ -191,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).