From: Junio C Hamano Date: Thu, 28 Sep 2017 05:47:55 +0000 (+0900) Subject: Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' X-Git-Tag: v2.15.0-rc0~43 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1ba75ffd0194b965a1fa510f5f4571333544eaf9?ds=inline;hp=-c Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' A docfix. * jk/doc-read-tree-table-asciidoctor-fix: doc: put literal block delimiter around table --- 1ba75ffd0194b965a1fa510f5f4571333544eaf9 diff --combined Documentation/git-read-tree.txt index 02576d8c0a,665bf9f25b..72bd809fb8 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@@ -115,12 -115,6 +115,12 @@@ OPTION directories the index file and index output file are located in. +--[no-]recurse-submodules:: + Using --recurse-submodules will update the content of all initialized + submodules according to the commit recorded in the superproject by + calling read-tree recursively, also setting the submodules HEAD to be + detached at that commit. + --no-sparse-checkout:: Disable sparse checkout support even if `core.sparseCheckout` is true. @@@ -137,7 -131,7 +137,7 @@@ Mergin ------- If `-m` is specified, 'git read-tree' can perform 3 kinds of merge, a single tree merge if only 1 tree is given, a -fast-forward merge with 2 trees, or a 3-way merge if 3 trees are +fast-forward merge with 2 trees, or a 3-way merge if 3 or more trees are provided. @@@ -179,6 -173,7 +179,7 @@@ Here are the "carry forward" rules, whe "clean" means that index and work tree coincide, and "exists"/"nothing" refer to the presence of a path in the specified commit: + .... I H M Result ------------------------------------------------------- 0 nothing nothing nothing (does not happen) @@@ -217,6 -212,7 +218,7 @@@ 19 no no yes exists exists keep index 20 yes yes no exists exists use M 21 no yes no exists exists fail + .... In all "keep index" cases, the index entry stays as in the original index file. If the entry is not up to date,