mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stash: update documentation to use 'stash entry'

Browse Source 
Most of the time, a 'stash entry' is called a 'stash'. Lets try to make
this more consistent and use 'stash entry' instead.

Signed-off-by: Liam Beguin <liambeguin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Liam Beguin
2017-06-17 18:30:50 -04:00
committed by Junio C Hamano
parent 97e2ff4643
commit e01db917d8
6 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-stash.sh
View File

@ -481,7 +481,7 @@ parse_flags_and_rev()
case $# in
0)
have_stash || die "$(gettext "No stash found.")"
have_stash || die "$(gettext "No stash entries found.")"
set -- ${ref_stash}@{0}
;;
1)
@ -573,7 +573,7 @@ apply_stash () {
GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" &&
GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
rm -f "$TMPindex" ||
die "$(gettext "Could not restore untracked files from stash")"
die "$(gettext "Could not restore untracked files from stash entry")"
fi
eval "
@ -627,7 +627,7 @@ pop_stash() {
drop_stash "$@"
else
status=$?
say "$(gettext "The stash is kept in case you need it again.")"
say "$(gettext "The stash entry is kept in case you need it again.")"
exit $status
fi
}