diff options
Diffstat (limited to 'git-checkout.html')
| -rw-r--r-- | git-checkout.html | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/git-checkout.html b/git-checkout.html index add5ff025..0f72e0a44 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -753,8 +753,10 @@ git-checkout(1) Manual Page <em>git checkout</em> [-q] [-f] [-m] --detach [<branch>]
<em>git checkout</em> [-q] [-f] [-m] [--detach] <commit>
<em>git checkout</em> [-q] [-f] [-m] [[-b|-B|--orphan] <new-branch>] [<start-point>]
-<em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>…
-<em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]
+<em>git checkout</em> [-f] <tree-ish> [--] <pathspec>…
+<em>git checkout</em> [-f] <tree-ish> --pathspec-from-file=<file> [--pathspec-file-nul]
+<em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=<style>] [--] <pathspec>…
+<em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=<style>] --pathspec-from-file=<file> [--pathspec-file-nul]
<em>git checkout</em> (-p|--patch) [<tree-ish>] [--] [<pathspec>…]</pre>
<div class="attribution">
</div></div>
@@ -1103,7 +1105,8 @@ paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with <code>git add</code> (or <code>git rm</code> if the merge
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>
+the conflicted merge in the specified paths. This option cannot be
+used when checking out paths from a tree-ish.</p></div>
<div class="paragraph"><p>When switching branches with <code>--merge</code>, staged changes may be lost.</p></div>
</dd>
<dt class="hdlist1">
@@ -1630,7 +1633,7 @@ checkout.thresholdForParallelism <div id="footer">
<div id="footer-text">
Last updated
- 2023-04-27 16:21:11 PDT
+ 2023-10-02 12:46:05 PDT
</div>
</div>
</body>
|