X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-read-tree.txt;h=1f21d95684a476a7e771ef166536415b5fe81a3c;hb=6bd20358a9b831b3b545284188871bc844245c25;hp=844cfda8d23e216a090ef94c9b85c186f2d31399;hpb=9086a18cb81f99fff943b36830396ac8c37c7e9f;p=git.git diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 844cfda8..1f21d956 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -8,7 +8,7 @@ git-read-tree - Reads tree information into the index SYNOPSIS -------- -'git-read-tree' ( | [[-m [--aggressive]| --reset] [-u | -i]] [ []]) +'git-read-tree' ( | [[-m [--aggressive] | --reset | --prefix=] [-u | -i]] [ []]) DESCRIPTION @@ -63,6 +63,15 @@ OPTIONS * when both sides adds a path identically. The resolution is to add that path. +--prefix=/:: + Keep the current index contents, and read the contents + of named tree-ish under directory at ``. The + original index file cannot have anything at the path + `` itself, and have nothing in `/` + directory. Note that the `/` value must end + with a slash. + + :: The id of the tree object(s) to be read/merged.