diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-13 17:40:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-13 17:40:50 -0700 |
| commit | 91a411f3c81ee50b7d9a6476828a238397f5456a (patch) | |
| tree | cda6c1078bce41f3d9e19475a1e8d105a8401077 /git-merge.html | |
| parent | 01009d54ee08e7b28b2cd86ae8c30f8adaf00d89 (diff) | |
| download | git-htmldocs-91a411f3c81ee50b7d9a6476828a238397f5456a.tar.gz | |
Autogenerated HTML docs for v2.32.0-264-g75ae1
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.html b/git-merge.html index e5fa08d72..94b3bb7ed 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1744,7 +1744,7 @@ merge.defaultToUpstream branches at the remote named by <code>branch.<current branch>.remote</code>
are consulted, and then they are mapped via <code>remote.<remote>.fetch</code>
to their corresponding remote-tracking branches, and the tips of
- these tracking branches are merged.
+ these tracking branches are merged. Defaults to true.
</p>
</dd>
<dt class="hdlist1">
@@ -2151,7 +2151,7 @@ branch.<name>.mergeOptions <div id="footer">
<div id="footer-text">
Last updated
- 2020-05-09 07:24:24 JST
+ 2020-05-08 15:24:24 PDT
</div>
</div>
</body>
|