Merge branch 'ab/sha1dc-maint'

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 53f4e144444ae7b30ce2634c0f364400927b27d2..a5afd602d8eb6cf6fdfbb20863e913a5318c354d 100644 (file)
--- 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