From: Nikolai Weibull Date: Mon, 14 Nov 2005 23:20:01 +0000 (+0100) Subject: Document a couple of missing command-line options. X-Git-Tag: v0.99.9i^2~3 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=2db0bfbc04478d9fb42f58ff50ad4123a2a9ddde;p=git.git Document a couple of missing command-line options. This patch adds documentation to quite a few command-line options. Signed-off-by: Nikolai Weibull Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt index 94b283a6..5bff4865 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 28a1500d..8d96a91b 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 diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index e219c6a7..7be0cbd6 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.