From: Simon Ruderich <simon@ruderich.org>
Date: Wed, 13 Jun 2018 15:06:21 +0000 (+0200)
Subject: vcs/gitconfig: replace "stash save" with "stash push" in aliases
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=4fc2ad6;hp=25921e0617c0b6df6b4dc61b272237934f20e383;p=config%2Fdotfiles.git

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

"stash push" supports stashing only parts of the working tree which is
very useful. We keep the "ss" alias as "stash push" would conflict with
the existing alias for "stash pop".
---

diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in
index 7b76f41..3d3afce 100644
--- 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"