diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 16:07:42 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 16:07:42 +0900 |
commit | b9d9d90d180cf21baeeb16bd89828d25c7901470 (patch) | |
tree | a40241052af8d4f5543b66581e3f0235cfae0af3 /git-read-tree.html | |
parent | ccb8252b46bfba5daf0cfcedaf0f9d2e14ba356f (diff) | |
download | git-htmldocs-b9d9d90d180cf21baeeb16bd89828d25c7901470.tar.gz |
Autogenerated HTML docs for v2.17.0-775-ge144d
Diffstat (limited to 'git-read-tree.html')
-rw-r--r-- | git-read-tree.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-read-tree.html b/git-read-tree.html index 7f9c18503..47a08436b 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -1,9 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 8.6.10" />
<title>git-read-tree(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -968,7 +969,7 @@ when both sides add a path identically. The resolution </div>
</div>
<div class="sect1">
-<h2 id="_merging">Merging</h2>
+<h2 id="_merging">MERGING</h2>
<div class="sectionbody">
<div class="paragraph"><p>If <code>-m</code> is specified, <em>git read-tree</em> can perform 3 kinds of
merge, a single tree merge if only 1 tree is given, a
@@ -1235,7 +1236,7 @@ have finished your work-in-progress), attempt the merge again.</p></div> </div>
</div>
<div class="sect1">
-<h2 id="_sparse_checkout">Sparse checkout</h2>
+<h2 id="_sparse_checkout">SPARSE CHECKOUT</h2>
<div class="sectionbody">
<div class="paragraph"><p>"Sparse checkout" allows populating the working directory sparsely.
It uses the skip-worktree bit (see <a href="git-update-index.html">git-update-index(1)</a>) to tell
@@ -1293,7 +1294,7 @@ support.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-01-26 15:11:04 PST
+ 2018-05-23 16:06:29 JST
</div>
</div>
</body>
|