X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-read-tree.txt;h=58fb906ef68e8b800b0616a5655aa757a362ed6e;hb=c30e699fc509f43f459c17d3148e7d866fb9157a;hp=cbe68352bfbb957ccbbc99fae4f97c49d90c647e;hpb=dceab837557077f70bf082727645925aec443500;p=git.git diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index cbe68352b..58fb906ef 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -50,6 +50,9 @@ OPTIONS trees that are not directly related to the current working tree status into a temporary index file. +-v:: + Show the progress of checking files out. + --trivial:: Restrict three-way merge by `git-read-tree` to happen only if there is no file-level merging required, instead