correct usage help string for git-hash-object

dmpot · gitster · commit 9ae8e008abf2 · 2008-08-03T13:23:15.000-07:00
The usage string is corrected to make it fit in 80 columns and to make it
unequivocal about what options can be used with --stdin-paths.

Signed-off-by: Dmitry Potapov &lt;dpotapov@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
@@ -8,7 +8,9 @@ git-hash-object - Compute object ID and optionally creates a blob from a file
 
 SYNOPSIS
 --------
-'git hash-object' [-t <type>] [-w] [--stdin | --stdin-paths] [--] <file>...
+[verse]
+'git hash-object' [-t <type>] [-w] [--stdin] [--] <file>...
+'git hash-object' [-t <type>] [-w] --stdin-paths < <list-of-paths>
 
 DESCRIPTION
 -----------
diff --git a/hash-object.c b/hash-object.c
@@ -50,7 +50,8 @@ static void hash_stdin_paths(const char *type, int write_objects)
 }
 
 static const char hash_object_usage[] =
-"git hash-object [ [-t <type>] [-w] [--stdin] <file>... | --stdin-paths < <list-of-paths> ]";
+"git hash-object [-t <type>] [-w] [--stdin] [--] <file>...\n"
+"   or: git hash-object  --stdin-paths < <list-of-paths>";
 
 int main(int argc, char **argv)
 {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,8 @@ static void hash_stdin_paths(const char *type, int write_objects)`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`static const char hash_object_usage[] =`
`53`		`-"git hash-object [ [-t <type>] [-w] [--stdin] <file>... \| --stdin-paths < <list-of-paths> ]";`
	`53`	`+"git hash-object [-t <type>] [-w] [--stdin] [--] <file>...\n"`
	`54`	`+" or: git hash-object --stdin-paths < <list-of-paths>";`
`54`	`55`
`55`	`56`	`int main(int argc, char **argv)`
`56`	`57`	`{`