|
4 | 4 | <meta charset="UTF-8"> |
5 | 5 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
6 | 6 | <meta name="viewport" content="width=device-width, initial-scale=1.0"> |
7 | | -<meta name="generator" content="Asciidoctor 2.0.23"> |
| 7 | +<meta name="generator" content="Asciidoctor 2.0.25"> |
8 | 8 | <title>git-lfs-checkout(1)</title> |
9 | 9 | <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700"> |
10 | 10 | <style> |
|
116 | 116 | :not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed} |
117 | 117 | pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed} |
118 | 118 | pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit} |
119 | | -pre>code{display:block} |
120 | 119 | pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal} |
121 | 120 | em em{font-style:normal} |
122 | 121 | strong strong{font-weight:400} |
|
219 | 218 | .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8} |
220 | 219 | .literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)} |
221 | 220 | .listingblock>.content{position:relative} |
| 221 | +.listingblock pre>code{display:block} |
222 | 222 | .listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5} |
223 | 223 | .listingblock:hover code[data-lang]::before{display:block} |
224 | 224 | .listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5} |
@@ -482,7 +482,31 @@ <h2 id="_description">DESCRIPTION</h2> |
482 | 482 | Git LFS object into a separate file (which can be outside of the work |
483 | 483 | tree). This can make using diff tools to inspect and resolve merges |
484 | 484 | easier. A single Git LFS object’s file path must be provided in |
485 | | -<code><conflict-obj-path></code>.</p> |
| 485 | +<code><conflict-obj-path></code>. If <code><file></code> already exists, whether as a regular |
| 486 | +file, symbolic link, or directory, it will be removed and replaced, unless |
| 487 | +it is a non-empty directory or otherwise cannot be deleted.</p> |
| 488 | +</div> |
| 489 | +<div class="paragraph"> |
| 490 | +<p>If the installed Git version is at least 2.42.0, |
| 491 | +this command will by default check out Git LFS objects for files |
| 492 | +only if they are present in the Git index and if they match a Git LFS |
| 493 | +filter attribute from a <code>.gitattributes</code> file that is present in either |
| 494 | +the index or the current working tree (or, as is always the case, if |
| 495 | +they match a Git LFS filter attribute in a local <code>gitattributes</code> file |
| 496 | +such as <code>$GIT_DIR/info/attributes</code>). These constraints do not apply |
| 497 | +with prior versions of Git.</p> |
| 498 | +</div> |
| 499 | +<div class="paragraph"> |
| 500 | +<p>In a repository with a partial clone or sparse checkout, it is therefore |
| 501 | +advisable to check out all <code>.gitattributes</code> files from <code>HEAD</code> before |
| 502 | +using this command, if Git v2.42.0 or later is installed. Alternatively, |
| 503 | +the <code>GIT_ATTR_SOURCE</code> environment variable may be set to <code>HEAD</code>, which |
| 504 | +will cause Git to only read attributes from <code>.gitattributes</code> files in |
| 505 | +<code>HEAD</code> and ignore those in the index or working tree.</p> |
| 506 | +</div> |
| 507 | +<div class="paragraph"> |
| 508 | +<p>In a bare repository, this command has no effect. In a future version, |
| 509 | +this command may exit with an error if it is run in a bare repository.</p> |
486 | 510 | </div> |
487 | 511 | </div> |
488 | 512 | </div> |
@@ -575,7 +599,7 @@ <h2 id="_examples">EXAMPLES</h2> |
575 | 599 | <h2 id="_see_also">SEE ALSO</h2> |
576 | 600 | <div class="sectionbody"> |
577 | 601 | <div class="paragraph"> |
578 | | -<p>git-lfs-fetch(1), git-lfs-pull(1), gitignore(5).</p> |
| 602 | +<p>git-lfs-fetch(1), git-lfs-pull(1), gitattributes(5), gitignore(5).</p> |
579 | 603 | </div> |
580 | 604 | <div class="paragraph"> |
581 | 605 | <p>Part of the git-lfs(1) suite.</p> |
|
0 commit comments