DORMANTno replies

[PATCH] Documentation: update-index: -z applies also to --index-info

From: Bert Wesarg <hidden>
Date: 2016-06-15 22:49:43
Subsystem: documentation, the rest · Maintainers: Jonathan Corbet, Linus Torvalds

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 <redacted>

---

We may like the usage string like this:

[[-z] --stdin | --index-info]

to make it also clear, that -z applies only to --stdin or --index-only.
---
 Documentation/git-update-index.txt |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 74d1d49..4441d7c 100644 Documentation/git-update-index.txt
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -18,8 +18,9 @@ SYNOPSIS
 	     [--skip-worktree | --no-skip-worktree]
 	     [--ignore-submodules]
 	     [--really-refresh] [--unresolve] [--again | -g]
-	     [--info-only] [--index-info]
-	     [-z] [--stdin]
+	     [--info-only]
+	     [-z]
+	     [--stdin] [--index-info]
 	     [--verbose]
 	     [--] [<file>]*
 
@@ -72,7 +73,7 @@ OPTIONS
 	Directly insert the specified info into the index.
 
 --index-info::
-        Read index information from stdin.
+        Read index information from stdin (Must be last option).
 
 --chmod=(+|-)x::
         Set the execute permissions on the updated files.
@@ -138,14 +139,15 @@ you will need to handle the situation manually.
 --stdin::
 	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.
+	separated by LF (i.e. one path per line) by default
+	(Must be 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.
-- 
1.7.1.1067.g5aeb7
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help