summaryrefslogtreecommitdiffstats
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorLiam Beguin <liambeguin@gmail.com>2017-06-17 18:30:50 -0400
committerJunio C Hamano <gitster@pobox.com>2017-06-18 22:16:36 -0700
commite01db917d8e5c66f9f90bf8c44995cf47200273a (patch)
treea1733a90149933d7902f1906c4c67e02d3bd218c /Documentation/git-rebase.txt
parent97e2ff464302565877a00b8a9aa6a2d85bd1445e (diff)
downloadgit-e01db917d8e5c66f9f90bf8c44995cf47200273a.tar.gz
git-e01db917d8e5c66f9f90bf8c44995cf47200273a.tar.xz
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 'Documentation/git-rebase.txt')
-rw-r--r--Documentation/git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 53f4e1444..a5afd602d 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -446,7 +446,7 @@ used to override and disable this setting.
--autostash::
--no-autostash::
- Automatically create a temporary stash before the operation
+ Automatically create a temporary stash entry before the operation
begins, and apply it after the operation ends. This means
that you can run rebase on a dirty worktree. However, use
with care: the final stash application after a successful