diff options
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.html b/git-pull.html index a84a3fd97..98e52b9aa 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1110,7 +1110,7 @@ option can be used to override --squash.</p></div> <dd>
<p>
Automatically create a temporary stash entry before the operation
- begins, record it in the special ref <code>MERGE_AUTOSTASH</code>
+ begins, record it in the ref <code>MERGE_AUTOSTASH</code>
and apply it after the operation ends. This means
that you can run the operation on a dirty worktree. However, use
with care: the final stash application after a successful
|