diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-29 17:03:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-29 17:03:20 -0700 |
| commit | 67cc2b7cdda7af3a7079b399a8a154d094efc649 (patch) | |
| tree | 9c4830195de2ffd5ecdfca15e0e04be9bf959a4e /git-config.html | |
| parent | 0dd50943c112dfc70367bd39eb3c88371db2518f (diff) | |
| download | git-htmldocs-67cc2b7cdda7af3a7079b399a8a154d094efc649.tar.gz | |
Autogenerated HTML docs for v2.26.2-447-gd61d2
Diffstat (limited to 'git-config.html')
| -rw-r--r-- | git-config.html | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/git-config.html b/git-config.html index 94f39c6a6..cbc3f5ab6 100644 --- a/git-config.html +++ b/git-config.html @@ -7034,6 +7034,21 @@ merge.stat </p>
</dd>
<dt class="hdlist1">
+merge.autoStash
+</dt>
+<dd>
+<p>
+ When set to true, automatically create a temporary stash entry
+ before the operation begins, and apply it after the operation
+ ends. This means that you can run merge on a dirty worktree.
+ However, use with care: the final stash application after a
+ successful merge might result in non-trivial conflicts.
+ This option can be overridden by the <code>--no-autostash</code> and
+ <code>--autostash</code> options of <a href="git-merge.html">git-merge(1)</a>.
+ Defaults to false.
+</p>
+</dd>
+<dt class="hdlist1">
merge.tool
</dt>
<dd>
|