diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-06-09 22:25:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-09 15:49:44 -0700 |
| commit | 22e801f285eefb9d5887091741e19a2c4f9798bf (patch) | |
| tree | cd3125cafad190faf7c8c8b1c0543c8a6447cd01 /Documentation/git-read-tree.txt | |
| parent | 170e095a9cfe31617162e8a9b5063b8bc38af82b (diff) | |
| download | git-22e801f285eefb9d5887091741e19a2c4f9798bf.tar.gz | |
git-read-tree: document -v option.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-read-tree.txt')
| -rw-r--r-- | Documentation/git-read-tree.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 8421d1fd78..c95ad9f145 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/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 |