[prev in list] [next in list] [prev in thread] [next in thread]
List: git
Subject: [PATCH] Add to documentation of git-update-index arguments and usage.
From: Chris Shoemaker <c.shoemaker () cox ! net>
Date: 2005-10-29 21:46:41
Message-ID: 11306224012707-git-send-email-c.shoemaker () cox ! net
[Download RAW message or body]
Removed unknown [--version] option.
Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net>
---
Documentation/git-update-index.txt | 28 ++++++++++++++++++++++++----
update-index.c | 2 +-
2 files changed, 25 insertions(+), 5 deletions(-)
f51a2698073b75c6e0e0f96c0f1f6432167ed85b
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -9,12 +9,13 @@ git-update-index - Modifies the index or
SYNOPSIS
--------
'git-update-index'
- [--add] [--remove] [--refresh] [--replace]
- [--ignore-missing]
- [--force-remove]
+ [--add] [--remove | --force-remove] [--replace]
+ [--refresh [-q] [--unmerged] [--ignore-missing]]
[--cacheinfo <mode> <object> <file>]\*
- [--info-only]
+ [--chmod=(+|-)x]
+ [--info-only] [--index-info]
[-z] [--stdin]
+ [--verbose]
[--] [<file>]\*
DESCRIPTION
@@ -42,12 +43,28 @@ OPTIONS
Looks at the current cache and checks to see if merges or
updates are needed by checking stat() information.
+-q::
+ Quiet. If --refresh finds that the cache needs an update, the
+ default behavior is to error out. This option makes
+ git-update-index continue anyway.
+
+--unmerged::
+ If --refresh finds unmerged changes in the cache, the default
+ behavior is to error out. This option makes git-update-index
+ continue anyway.
+
--ignore-missing::
Ignores missing files during a --refresh
--cacheinfo <mode> <object> <path>::
Directly insert the specified info into the cache.
+--index-info::
+ Read index info from stdin.
+
+--chmod=(+|-)x::
+ Set the execute permissions on the updated files.
+
--info-only::
Do not create objects in the object database for all
<file> arguments that follow this flag; just insert
@@ -70,6 +87,9 @@ OPTIONS
read list of paths from the standard input. Paths are
separated by LF (i.e. one path per line) by default.
+--verbose::
+ Report what is being added and removed from index.
+
-z::
Only meaningful with `--stdin`; paths are separated with
NUL character instead of LF.
diff --git a/update-index.c b/update-index.c
--- a/update-index.c
+++ b/update-index.c
@@ -393,7 +393,7 @@ static void read_index_info(int line_ter
}
static const char update_index_usage[] =
-"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] \
[--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] \
[--index-info] [--ignore-missing] [-z] [--version] [--] <file>..."; \
+"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] \
[--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] \
[--index-info] [--ignore-missing] [-z] [--verbose] [--] <file>...";
int main(int argc, const char **argv)
{
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic