diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-04 14:41:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-04 14:41:11 -0700 |
| commit | 2e5fb40de75574efc246d6d0bcf9dbde11c18c12 (patch) | |
| tree | 15af17893c0e005f12954b3b35926d9eabbc76cd /git-pull.html | |
| parent | 9a9436daade6c6669cf99e610278683a2f85112c (diff) | |
| download | git-htmldocs-2e5fb40de75574efc246d6d0bcf9dbde11c18c12.tar.gz | |
Autogenerated HTML docs for v2.33.0-rc0-52-ge5a14d
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-pull.html b/git-pull.html index e7d3c0077..f38e03896 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1095,7 +1095,8 @@ option can be used to override --squash.</p></div> <dd>
<p>
Automatically create a temporary stash entry before the operation
- begins, and apply it after the operation ends. This means
+ begins, record it in the special 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
merge might result in non-trivial conflicts.
|