diff options
| author | Nikolai Weibull <mailing-lists.git@rawuncut.elitemail.org> | 2005-11-15 00:20:01 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-14 17:15:32 -0800 |
| commit | 2db0bfbc04478d9fb42f58ff50ad4123a2a9ddde (patch) | |
| tree | 567bfa75ebd1aee82365e6ec8eb6f5d693cb4d3a /Documentation/git-read-tree.txt | |
| parent | b2309b70197f9067cb32a620465a9b3477d8f0c3 (diff) | |
| download | git-2db0bfbc04478d9fb42f58ff50ad4123a2a9ddde.tar.gz git-2db0bfbc04478d9fb42f58ff50ad4123a2a9ddde.tar.xz | |
Document a couple of missing command-line options.
This patch adds documentation to quite a few command-line options.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
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 e219c6a78..7be0cbd62 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. |