vcs/gitconfig: replace "stash save" with "stash push" in aliases

[config/dotfiles.git] / vcs / gitconfig.in

diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in
index 98702c725c92539c5120cbc5a70a6615581d48e0..3d3afced140e378df75a71c99417c4d37a937425 100644 (file)
--- a/vcs/gitconfig.in
+++ b/vcs/gitconfig.in
@@ -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).