diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:18 -0700 |
| commit | 2a1be3f8c41a4eefa8842d01d246ef8111245414 (patch) | |
| tree | 4db574496c83633746040d89080ae4d7c2c14641 /Documentation | |
| parent | 7fd739cd5720fbd1d170584baff7e4f706df641c (diff) | |
| parent | fb1bb96516d4bc985393c0bfb8bb7a6d6ce95045 (diff) | |
| download | git-2a1be3f8c41a4eefa8842d01d246ef8111245414.tar.gz | |
Merge branch 'jk/read-tree-empty'
* jk/read-tree-empty:
read-tree: deprecate syntax without tree-ish args
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-read-tree.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 2e78da448f..e88e9c2d55 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -11,7 +11,7 @@ SYNOPSIS 'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--index-output=<file>] [--no-sparse-checkout] - <tree-ish1> [<tree-ish2> [<tree-ish3>]] + (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]]) DESCRIPTION @@ -114,6 +114,10 @@ OPTIONS Disable sparse checkout support even if `core.sparseCheckout` is true. +--empty:: + Instead of reading tree object(s) into the index, just empty + it. + <tree-ish#>:: The id of the tree object(s) to be read/merged. |