diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-14 18:39:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-14 18:39:18 -0800 |
| commit | 60d64db4614b1007ca37c228923ec1964d5ad394 (patch) | |
| tree | d376d7e422b9a6cc51ef9a4b7f90e59f5520247e /Documentation/git-read-tree.txt | |
| parent | f7a2eb735982e921ae4379f1dcf5f7a023610393 (diff) | |
| parent | d7bba815753bf8c31886fcf6bb89c9e6250674a5 (diff) | |
| download | git-0.99.9i.tar.xz | |
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-read-tree.txt')
| -rw-r--r-- | Documentation/git-read-tree.txt | 4 |
1 files changed, 4 insertions, 0 deletions
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. |