From: Junio C Hamano Date: Thu, 15 Feb 2018 23:18:14 +0000 (-0800) Subject: Merge branch 'as/read-tree-prefix-doc-fix' into maint X-Git-Tag: v2.16.2~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d4e528ef6a00b2176e69e426be0da19c86577ffc?ds=inline;hp=-c Merge branch 'as/read-tree-prefix-doc-fix' into maint Doc update. * as/read-tree-prefix-doc-fix: doc/read-tree: remove obsolete remark --- d4e528ef6a00b2176e69e426be0da19c86577ffc diff --combined Documentation/git-read-tree.txt index 72bd809fb8,a34190bb88..f2a07d54d6 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@@ -81,12 -81,11 +81,11 @@@ OPTION * when both sides add a path identically. The resolution is to add that path. - --prefix=/:: + --prefix=:: Keep the current index contents, and read the contents of the named tree-ish under the directory at ``. The command will refuse to overwrite entries that already - existed in the original index file. Note that the `/` - value must end with a slash. + existed in the original index file. --exclude-per-directory=:: When running the command with `-u` and `-m` options, the @@@ -115,12 -114,6 +114,12 @@@ 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 -130,7 +136,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,7 -172,6 +178,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) @@@ -218,7 -210,6 +217,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,