diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-22 12:38:39 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-22 12:38:39 +0900 |
| commit | b551377cb5b53a9d5872eeaa46cd5b3a0a661435 (patch) | |
| tree | e9b56aec3e6abf5746d842678d8fa88b01472e8d /git-read-tree.html | |
| parent | 6b7d215a58fcad73e1d989b5767c9d3b2ba6608b (diff) | |
| download | git-htmldocs-b551377cb5b53a9d5872eeaa46cd5b3a0a661435.tar.gz | |
Autogenerated HTML docs for v2.21.0-498-g14c0f8
Diffstat (limited to 'git-read-tree.html')
| -rw-r--r-- | git-read-tree.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-read-tree.html b/git-read-tree.html index 47a08436b..ca8a8c7b6 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -791,8 +791,9 @@ will be in unmerged state when <em>git read-tree</em> returns.</p></div> </dt>
<dd>
<p>
- Same as -m, except that unmerged entries are discarded
- instead of failing.
+ Same as -m, except that unmerged entries are discarded instead
+ of failing. When used with <code>-u</code>, updates leading to loss of
+ working tree changes will not abort the operation.
</p>
</dd>
<dt class="hdlist1">
@@ -1294,7 +1295,7 @@ support.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-05-23 16:06:29 JST
+ 2019-04-22 12:35:42 JST
</div>
</div>
</body>
|