Merge branch 'cc/aix-has-fileno-as-a-macro'

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 5c70bc2878fc2f68698b931c6bf951d0097ef813..d27184260856131f87fc0071c02204c6323b4f69 100644 (file)
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -38,8 +38,9 @@ OPTIONS
        started.
 
 --reset::
-        Same as -m, except that unmerged entries are discarded
-        instead of failing.
+       Same as -m, except that unmerged entries are discarded instead
+       of failing. When used with `-u`, updates leading to loss of
+       working tree changes will not abort the operation.
 
 -u::
        After a successful merge, update the files in the work
@@ -128,6 +129,10 @@ OPTIONS
        Instead of reading tree object(s) into the index, just empty
        it.
 
+-q::
+--quiet::
+       Quiet, suppress feedback messages.
+
 <tree-ish#>::
        The id of the tree object(s) to be read/merged.