{"thread":{"id":"2272","subject":"[PATCH] Add to usage and docs for git-add.sh","startedAt":"2005-10-29T21:46:41Z","lastAt":"2005-10-29T21:46:41Z","messageCount":2,"participants":["Chris Shoemaker"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"10801","messageId":"11306224011312-git-send-email-c.shoemaker@cox.net","threadId":"2272","inReplyTo":"11306224012707-git-send-email-c.shoemaker@cox.net","subject":"[PATCH] Add to usage and docs for git-add.sh","fromName":"Chris Shoemaker","fromEmail":"c.shoemaker@cox.net","sentAt":"2005-10-29T21:46:41Z","receivedAt":"2005-10-29T21:46:41Z","isPatch":true,"sender":{"key":"c.shoemaker@cox.net","avatar":null},"body":"Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net>\n\n---\n\n Documentation/git-add.txt |    9 ++++++++-\n git-add.sh                |    7 +++++++\n 2 files changed, 15 insertions(+), 1 deletions(-)\n\n2bc166e3e8241432b88ff793ec69a979a7056b3e\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -7,7 +7,7 @@ git-add - Add files to the cache.\n \n SYNOPSIS\n --------\n-'git-add' <file>...\n+'git-add' [-n] [-v] <file>...\n \n DESCRIPTION\n -----------\n@@ -19,6 +19,13 @@ OPTIONS\n <file>...::\n \tFiles to add to the cache.\n \n+-n::\n+        Don't actually add the file(s), just show if they exist.\n+\n+-v::\n+        Be verbose.\n+\n+\n Author\n ------\n Written by Linus Torvalds <torvalds@osdl.org>\ndiff --git a/git-add.sh b/git-add.sh\n--- a/git-add.sh\n+++ b/git-add.sh\n@@ -1,5 +1,9 @@\n #!/bin/sh\n \n+usage() {\n+    die \"usage: git add [-n] [-v] <file>...\"\n+}\n+\n show_only=\n verbose=\n while : ; do\n@@ -10,6 +14,9 @@ while : ; do\n     -v)\n \tverbose=--verbose\n \t;;\n+    -*)\n+\tusage\n+\t;;\n     *)\n \tbreak\n \t;;\n"},{"id":"10802","messageId":"11306224012707-git-send-email-c.shoemaker@cox.net","threadId":"2272","inReplyTo":"11306224011899-git-send-email-c.shoemaker@cox.net","subject":"[PATCH] Add to documentation of git-update-index arguments and usage.","fromName":"Chris Shoemaker","fromEmail":"c.shoemaker@cox.net","sentAt":"2005-10-29T21:46:41Z","receivedAt":"2005-10-29T21:46:41Z","isPatch":true,"sender":{"key":"c.shoemaker@cox.net","avatar":null},"body":"Removed unknown [--version] option.\n\nSigned-off-by: Chris Shoemaker <c.shoemaker@cox.net>\n\n---\n\n Documentation/git-update-index.txt |   28 ++++++++++++++++++++++++----\n update-index.c                     |    2 +-\n 2 files changed, 25 insertions(+), 5 deletions(-)\n\nf51a2698073b75c6e0e0f96c0f1f6432167ed85b\ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -9,12 +9,13 @@ git-update-index - Modifies the index or\n SYNOPSIS\n --------\n 'git-update-index'\n-\t     [--add] [--remove] [--refresh] [--replace]\n-\t     [--ignore-missing]\n-\t     [--force-remove]\n+\t     [--add] [--remove | --force-remove] [--replace] \n+             [--refresh [-q] [--unmerged] [--ignore-missing]]\n \t     [--cacheinfo <mode> <object> <file>]\\*\n-\t     [--info-only]\n+             [--chmod=(+|-)x]\n+\t     [--info-only] [--index-info]\n \t     [-z] [--stdin]\n+             [--verbose]\n \t     [--] [<file>]\\*\n \n DESCRIPTION\n@@ -42,12 +43,28 @@ OPTIONS\n \tLooks at the current cache and checks to see if merges or\n \tupdates are needed by checking stat() information.\n \n+-q::\n+        Quiet.  If --refresh finds that the cache needs an update, the\n+        default behavior is to error out.  This option makes\n+        git-update-index continue anyway.\n+\n+--unmerged::\n+        If --refresh finds unmerged changes in the cache, the default \n+        behavior is to error out.  This option makes git-update-index \n+        continue anyway.\n+\n --ignore-missing::\n \tIgnores missing files during a --refresh\n \n --cacheinfo <mode> <object> <path>::\n \tDirectly insert the specified info into the cache.\n \t\n+--index-info::\n+        Read index info from stdin.\n+\n+--chmod=(+|-)x::\n+        Set the execute permissions on the updated files.        \n+\n --info-only::\n \tDo not create objects in the object database for all\n \t<file> arguments that follow this flag; just insert\n@@ -70,6 +87,9 @@ OPTIONS\n \tread list of paths from the standard input.  Paths are\n \tseparated by LF (i.e. one path per line) by default.\n \n+--verbose::\n+        Report what is being added and removed from index.\n+\n -z::\n \tOnly meaningful with `--stdin`; paths are separated with\n \tNUL character instead of LF.\ndiff --git a/update-index.c b/update-index.c\n--- a/update-index.c\n+++ b/update-index.c\n@@ -393,7 +393,7 @@ static void read_index_info(int line_ter\n }\n \n static const char update_index_usage[] =\n-\"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--version] [--] <file>...\";\n+\"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--verbose] [--] <file>...\";\n \n int main(int argc, const char **argv)\n {\n"}]}