From: Bert Wesarg <bert.wesarg@googlemail.com>
To: "Štěpán Němec" <stepnem@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Bert Wesarg <bert.wesarg@googlemail.com>
Subject: [PATCH] Documentation: update-index: -z applies also to --index-info
Date: Thu, 7 Oct 2010 20:59:51 +0200 [thread overview]
Message-ID: <081ad1459d5b1584cbe474581bd3a01d0d58d11d.1286477945.git.bert.wesarg@googlemail.com> (raw)
In-Reply-To: <AANLkTimsJ+uG7KhiBMii8szFYmbXo5OjAkYgs99_Hjzr@mail.gmail.com>
Also mention, that --stdin and --index-info needs to be the last
option supplied and indicate this in the usage string.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
Documentation/git-update-index.txt | 13 +++++++------
builtin/update-index.c | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 74d1d49..022c0fc 100644 Documentation/git-update-index.txt
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -18,10 +18,10 @@ SYNOPSIS
[--skip-worktree | --no-skip-worktree]
[--ignore-submodules]
[--really-refresh] [--unresolve] [--again | -g]
- [--info-only] [--index-info]
- [-z] [--stdin]
+ [--info-only]
[--verbose]
- [--] [<file>]*
+ [[-z] --stdin | --index-info]
+ [--] [<file>]
DESCRIPTION
-----------
@@ -72,7 +72,7 @@ OPTIONS
Directly insert the specified info into the index.
--index-info::
- Read index information from stdin.
+ Read index information from stdin. (Must be the last option.)
--chmod=(+|-)x::
Set the execute permissions on the updated files.
@@ -139,13 +139,14 @@ you will need to handle the situation manually.
Instead of taking list of paths from the command line,
read list of paths from the standard input. Paths are
separated by LF (i.e. one path per line) by default.
+ (Must be the last option.)
--verbose::
Report what is being added and removed from index.
-z::
- Only meaningful with `--stdin`; paths are separated with
- NUL character instead of LF.
+ Only meaningful with `--stdin` or `--index-info`; paths are
+ separated with NUL character instead of LF.
\--::
Do not interpret any more arguments as options.
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 3ab214d..2c1a81e 100644 builtin/update-index.c
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -398,7 +398,7 @@ static void read_index_info(int line_termination)
}
static const char update_index_usage[] =
-"git update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--skip-worktree|--no-skip-worktree] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again | -g] [--ignore-missing] [-z] [--verbose] [--] <file>...";
+"git update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--skip-worktree|--no-skip-worktree] [--info-only] [--force-remove] [--unresolve] [--again | -g] [--ignore-missing] [--verbose] [[-z] --stdin | --index-info] [--] <file>...";
static unsigned char head_sha1[20];
static unsigned char merge_head_sha1[20];
--
1.7.1.1067.g5aeb7
next prev parent reply other threads:[~2010-10-07 19:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-07 13:23 [PATCH] Documentation: update-index: -z applies also to --index-info Bert Wesarg
2010-10-07 18:33 ` Štěpán Němec
2010-10-07 18:52 ` Bert Wesarg
2010-10-07 18:55 ` Bert Wesarg
2010-10-07 19:15 ` Jonathan Nieder
2010-10-07 19:27 ` Štěpán Němec
2010-10-07 18:59 ` Bert Wesarg [this message]
2010-10-07 19:36 ` Štěpán Němec
2010-10-07 19:39 ` Bert Wesarg
2010-10-07 19:39 ` Bert Wesarg
2010-10-08 2:49 ` Junio C Hamano
2010-10-08 6:47 ` Bert Wesarg
2010-10-08 6:50 ` Bert Wesarg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=081ad1459d5b1584cbe474581bd3a01d0d58d11d.1286477945.git.bert.wesarg@googlemail.com \
--to=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=stepnem@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).