diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-27 15:51:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-27 15:51:52 -0800 |
| commit | 7ae46b40202f2928d34d523c62e7c215f44f91bf (patch) | |
| tree | ffb22c4c699c9a6be3281ddd35ee32753d75141a /git-pull.html | |
| parent | 8c556f838df5e9e4fbfe52d9ad098610973b13bf (diff) | |
| download | git-htmldocs-7ae46b40202f2928d34d523c62e7c215f44f91bf.tar.gz | |
Autogenerated HTML docs for v2.43.0-232-ge7955
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
|