From: Dmitry Potapov <dpotapov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Alexander Litvinov <litvinov2004@gmail.com>,
git@vger.kernel.org, Eric Wong <normalperson@yhbt.net>,
Dmitry Potapov <dpotapov@gmail.com>
Subject: [PATCH 2/5] correct usage help string for git-hash-object
Date: Sun, 3 Aug 2008 18:36:19 +0400 [thread overview]
Message-ID: <1217774182-28566-2-git-send-email-dpotapov@gmail.com> (raw)
In-Reply-To: <1217774182-28566-1-git-send-email-dpotapov@gmail.com>
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>
---
Documentation/git-hash-object.txt | 4 +++-
hash-object.c | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index ac928e1..a4703ec 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 ce027b9..ac44b4e 100644
--- a/hash-object.c
+++ b/hash-object.c
@@ -49,7 +49,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)
{
--
1.6.0.rc1.58.gacdf
next prev parent reply other threads:[~2008-08-03 14:37 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-23 8:44 git-svn does not seems to work with crlf convertion enabled Alexander Litvinov
2008-07-23 9:18 ` Johannes Schindelin
2008-07-23 11:52 ` Alexander Litvinov
2008-07-23 12:57 ` Johannes Schindelin
2008-07-23 15:49 ` Avery Pennarun
2008-07-23 16:07 ` Johannes Schindelin
2008-07-24 3:13 ` Alexander Litvinov
2008-08-06 11:15 ` Petr Baudis
2008-08-06 12:35 ` Peter Harris
2008-08-06 12:43 ` Johannes Schindelin
2008-08-06 13:51 ` git-svn on MSysGit and why is it (going to be?) unsupported Petr Baudis
2008-08-06 15:23 ` Avery Pennarun
2008-08-06 16:11 ` git-svn does not seems to work with crlf convertion enabled Dmitry Potapov
2008-07-24 14:24 ` Dmitry Potapov
2008-07-24 14:40 ` Johannes Schindelin
2008-07-24 16:28 ` Avery Pennarun
2008-07-30 4:37 ` Alexander Litvinov
2008-07-31 5:43 ` [PATCH] git-svn now " Alexander Litvinov
2008-07-31 5:57 ` Alexander Litvinov
2008-07-31 10:45 ` Dmitry Potapov
2008-07-31 19:09 ` [RFC] hash-object --no-filters Dmitry Potapov
2008-08-01 3:23 ` [PATCH] git-svn now work with crlf convertion enabled Alexander Litvinov
2008-08-01 5:09 ` Junio C Hamano
2008-08-01 7:44 ` Dmitry Potapov
2008-08-01 11:27 ` Alexander Litvinov
2008-08-01 7:47 ` Dmitry Potapov
2008-08-01 8:08 ` Junio C Hamano
2008-08-01 9:24 ` Dmitry Potapov
2008-08-01 19:42 ` Junio C Hamano
2008-08-01 22:09 ` Dmitry Potapov
2008-08-01 22:14 ` Junio C Hamano
2008-08-01 23:10 ` Dmitry Potapov
2008-08-02 17:28 ` [PATCH] hash-object --no-filters Junio C Hamano
2008-08-03 5:42 ` Dmitry Potapov
2008-08-03 5:56 ` Dmitry Potapov
2008-08-03 14:36 ` [PATCH 1/5] correct argument checking test for git hash-object Dmitry Potapov
2008-08-03 14:36 ` Dmitry Potapov [this message]
2008-08-03 14:36 ` [PATCH 3/5] use parse_options() in " Dmitry Potapov
2008-08-03 14:36 ` [PATCH 4/5] add --path option to " Dmitry Potapov
2008-08-03 14:36 ` [PATCH 5/5] add --no-filters " Dmitry Potapov
2008-08-03 20:44 ` [PATCH] hash-object --no-filters Junio C Hamano
2008-08-01 11:11 ` [PATCH] git-svn now work with crlf convertion enabled Alexander Litvinov
2008-08-01 12:36 ` Dmitry Potapov
2008-08-04 3:10 ` Alexander Litvinov
2008-08-04 0:48 ` Eric Wong
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=1217774182-28566-2-git-send-email-dpotapov@gmail.com \
--to=dpotapov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=litvinov2004@gmail.com \
--cc=normalperson@yhbt.net \
/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).