diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-16 21:51:15 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 21:51:15 +0900 |
| commit | 6b7d215a58fcad73e1d989b5767c9d3b2ba6608b (patch) | |
| tree | 78de8e7c65f35106dfde60f0e6b4284f09e7f43f /git-checkout.html | |
| parent | e0f71462e15863fa4b188b26e30db0155d52a946 (diff) | |
| download | git-htmldocs-6b7d215a58fcad73e1d989b5767c9d3b2ba6608b.tar.gz | |
Autogenerated HTML docs for v2.21.0-419-gffac5
Diffstat (limited to 'git-checkout.html')
| -rw-r--r-- | git-checkout.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-checkout.html b/git-checkout.html index be664e4cd..6e148dce9 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -1073,6 +1073,7 @@ and mark the resolved paths with <code>git add</code> (or <code>git rm</code> if should result in deletion of the path).</p></div>
<div class="paragraph"><p>When checking out paths from the index, this option lets you recreate
the conflicted merge in the specified paths.</p></div>
+<div class="paragraph"><p>When switching branches with <code>--merge</code>, staged changes may be lost.</p></div>
</dd>
<dt class="hdlist1">
--conflict=<style>
@@ -1468,7 +1469,7 @@ $ git add frotz</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2019-03-07 12:16:20 JST
+ 2019-04-16 21:48:13 JST
</div>
</div>
</body>
|