mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'js/stash-dwim' into tr/reset-checkout-patch
* commit 'tr/reset-checkout-patch^^2': Make 'git stash -k' a short form for 'git stash save --keep-index'
This commit is contained in:
commit
367ea191e6
|
@ -13,7 +13,8 @@ SYNOPSIS
|
|||
'git stash' drop [-q|--quiet] [<stash>]
|
||||
'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
|
||||
'git stash' branch <branchname> [<stash>]
|
||||
'git stash' [save [--patch] [--[no-]keep-index] [-q|--quiet] [<message>]]
|
||||
'git stash' [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]]
|
||||
'git stash' [-k|--keep-index]
|
||||
'git stash' clear
|
||||
'git stash' create
|
||||
|
||||
|
|
16
git-stash.sh
16
git-stash.sh
|
@ -7,7 +7,8 @@ USAGE="list [<options>]
|
|||
or: $dashless drop [-q|--quiet] [<stash>]
|
||||
or: $dashless ( pop | apply ) [--index] [-q|--quiet] [<stash>]
|
||||
or: $dashless branch <branchname> [<stash>]
|
||||
or: $dashless [save [--keep-index] [-q|--quiet] [<message>]]
|
||||
or: $dashless [save [-k|--keep-index] [-q|--quiet] [<message>]]
|
||||
or: $dashless [-k|--keep-index]
|
||||
or: $dashless clear"
|
||||
|
||||
SUBDIRECTORY_OK=Yes
|
||||
|
@ -132,7 +133,7 @@ save_stash () {
|
|||
while test $# != 0
|
||||
do
|
||||
case "$1" in
|
||||
--keep-index)
|
||||
-k|--keep-index)
|
||||
keep_index=t
|
||||
;;
|
||||
--no-keep-index)
|
||||
|
@ -405,12 +406,13 @@ branch)
|
|||
apply_to_branch "$@"
|
||||
;;
|
||||
*)
|
||||
if test $# -eq 0
|
||||
then
|
||||
save_stash &&
|
||||
case $#,"$1" in
|
||||
0,|1,-k|1,--keep-index)
|
||||
save_stash "$@" &&
|
||||
say '(To restore them type "git stash apply")'
|
||||
else
|
||||
;;
|
||||
*)
|
||||
usage
|
||||
fi
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
|
|
@ -200,4 +200,12 @@ test_expect_success 'drop -q is quiet' '
|
|||
test ! -s output.out
|
||||
'
|
||||
|
||||
test_expect_success 'stash -k' '
|
||||
echo bar3 > file &&
|
||||
echo bar4 > file2 &&
|
||||
git add file2 &&
|
||||
git stash -k &&
|
||||
test bar,bar4 = $(cat file),$(cat file2)
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue