aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Potapov <dpotapov@gmail.com>2008-08-03 18:36:19 +0400
committerJunio C Hamano <gitster@pobox.com>2008-08-03 13:23:15 -0700
commit9ae8e008abf2e05dee59142fae068ae1f9004147 (patch)
tree82f5f2259f8041f7815fdf97abbadf4e53bac4df
parent81014073f22736e9dcb9370475af44e67234622f (diff)
downloadgit-9ae8e008abf2e05dee59142fae068ae1f9004147.tar.gz
git-9ae8e008abf2e05dee59142fae068ae1f9004147.tar.xz
correct usage help string for git-hash-object
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 <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-hash-object.txt4
-rw-r--r--hash-object.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index ac928e198..a4703ec0d 100644
--- 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
index 7acfae15d..bb7c5dc6e 100644
--- 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)
{