From 2db0bfbc04478d9fb42f58ff50ad4123a2a9ddde Mon Sep 17 00:00:00 2001 From: Nikolai Weibull Date: Tue, 15 Nov 2005 00:20:01 +0100 Subject: Document a couple of missing command-line options. This patch adds documentation to quite a few command-line options. Signed-off-by: Nikolai Weibull Signed-off-by: Junio C Hamano --- Documentation/git-read-tree.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Documentation/git-read-tree.txt') diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index e219c6a788..7be0cbd620 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -30,6 +30,10 @@ OPTIONS -m:: Perform a merge, not just a read. +--reset:: + + Same as -m except that unmerged entries will be silently ignored. + -u:: After a successful merge, update the files in the work tree with the result of the merge. -- cgit v1.3