diff options
| author | Liam Beguin <liambeguin@gmail.com> | 2017-06-17 18:30:50 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-18 22:16:36 -0700 |
| commit | e01db917d8e5c66f9f90bf8c44995cf47200273a (patch) | |
| tree | a1733a90149933d7902f1906c4c67e02d3bd218c /git-stash.sh | |
| parent | 97e2ff464302565877a00b8a9aa6a2d85bd1445e (diff) | |
| download | git-e01db917d8e5c66f9f90bf8c44995cf47200273a.tar.gz | |
stash: update documentation to use 'stash entry'
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>
Diffstat (limited to 'git-stash.sh')
| -rwxr-xr-x | git-stash.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-stash.sh b/git-stash.sh index 2fb651b2b8..68be4146bd 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -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 } |