X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-read-tree.txt;h=58fb906ef68e8b800b0616a5655aa757a362ed6e;hb=c30e699fc509f43f459c17d3148e7d866fb9157a;hp=8421d1fd78f245f6a80a04c880c455ca8bae0eed;hpb=dfb9a34ababeee98a9f241636c1fe6e98c754f7a;p=git.git diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 8421d1fd7..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 @@ -345,7 +348,7 @@ middle of doing, and when your working tree is ready (i.e. you have finished your work-in-progress), attempt the merge again. -See Also +SEE ALSO -------- linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5] @@ -361,4 +364,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list