From: Junio C Hamano Date: Tue, 10 Jun 2008 04:10:25 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.6-rc2-23-gea81e X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0a18b3535038faaf8564a7d20066913c4d9d14f9;p=git.git Autogenerated HTML docs for v1.5.6-rc2-23-gea81e --- diff --git a/git-read-tree.html b/git-read-tree.html index 3766d221f..1f405709e 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -333,6 +333,14 @@ will be in unmerged state when git-read-tree returns.

+-v +
+
+

+ Show the progress of checking files out. +

+
+
--trivial
@@ -711,7 +719,7 @@ have finished your work-in-progress), attempt the merge again.

diff --git a/git-read-tree.txt b/git-read-tree.txt index cbe68352b..58fb906ef 100644 --- a/git-read-tree.txt +++ b/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