diff options
author | Nikolai Weibull <mailing-lists.git@rawuncut.elitemail.org> | 2005-11-15 02:20:01 +0300 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-11-15 04:15:32 +0300 |
commit | 2db0bfbc04478d9fb42f58ff50ad4123a2a9ddde (patch) | |
tree | 567bfa75ebd1aee82365e6ec8eb6f5d693cb4d3a | |
parent | b2309b70197f9067cb32a620465a9b3477d8f0c3 (diff) |
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>
-rw-r--r-- | Documentation/git-checkout-index.txt | 10 | ||||
-rw-r--r-- | Documentation/git-prune-packed.txt | 6 | ||||
-rw-r--r-- | Documentation/git-read-tree.txt | 4 |
3 files changed, 15 insertions, 5 deletions
diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt index 94b283a6bf..5bff4865f7 100644 --- a/Documentation/git-checkout-index.txt +++ b/Documentation/git-checkout-index.txt @@ -18,21 +18,21 @@ Will copy all files listed from the index to the working directory OPTIONS ------- --u:: +-u|--index:: update stat information for the checked out entries in the index file. --q:: +-q|--quiet:: be quiet if files exist or are not in the index --f:: +-f|--force:: forces overwrite of existing files --a:: +-a|--all:: checks out all files in the index. Cannot be used together with explicit filenames. --n:: +-n|--no-create:: Don't checkout new files, only refresh files already checked out. diff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt index 28a1500d39..8d96a91b41 100644 --- a/Documentation/git-prune-packed.txt +++ b/Documentation/git-prune-packed.txt @@ -23,6 +23,12 @@ compression applied, stored in a single file, with an associated index file. Packs are used to reduce the load on mirror systems, backup engines, disk storage, etc. +OPTIONS +------- +-n:: + Don't actually remove any objects, only show those that would have been + removed. + Author ------ Written by Linus Torvalds <torvalds@osdl.org> 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. |