summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-11-03 23:32:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-11-03 23:32:38 (GMT)
commitf5f76845961f4207b3dc8c186b2356f160276e45 (patch)
treef88d6c141e2c6040b69e015e8c9d9a37bdd80111 /builtin
parent14f905caf2da593a65a2be51ff4d219e5cc3de04 (diff)
parent33e8fc87407505c3a96792fc47189d57b97b34c3 (diff)
downloadgit-f5f76845961f4207b3dc8c186b2356f160276e45.zip
git-f5f76845961f4207b3dc8c186b2356f160276e45.tar.gz
git-f5f76845961f4207b3dc8c186b2356f160276e45.tar.bz2
Merge branch 'jc/usage-stdin' into maint
The synopsis text and the usage string of subcommands that read list of things from the standard input are often shown as if they only take input from a file on a filesystem, which was misleading. * jc/usage-stdin: usage: do not insist that standard input must come from a file
Diffstat (limited to 'builtin')
-rw-r--r--builtin/cat-file.c2
-rw-r--r--builtin/check-attr.c2
-rw-r--r--builtin/check-ignore.c2
-rw-r--r--builtin/commit-tree.c2
-rw-r--r--builtin/get-tar-commit-id.c2
-rw-r--r--builtin/hash-object.c2
-rw-r--r--builtin/mktag.c2
-rw-r--r--builtin/patch-id.c2
-rw-r--r--builtin/show-ref.c2
-rw-r--r--builtin/stripspace.c4
-rw-r--r--builtin/unpack-objects.c2
11 files changed, 12 insertions, 12 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 07baad1..c0fd8db 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -426,7 +426,7 @@ static int batch_objects(struct batch_options *opt)
static const char * const cat_file_usage[] = {
N_("git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<type>|--textconv) <object>"),
- N_("git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-objects>"),
+ N_("git cat-file (--batch | --batch-check) [--follow-symlinks]"),
NULL
};
diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index 21d2bed..265c9ba 100644
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -9,7 +9,7 @@ static int cached_attrs;
static int stdin_paths;
static const char * const check_attr_usage[] = {
N_("git check-attr [-a | --all | <attr>...] [--] <pathname>..."),
-N_("git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"),
+N_("git check-attr --stdin [-z] [-a | --all | <attr>...]"),
NULL
};
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c
index dc8d97c..43f3617 100644
--- a/builtin/check-ignore.c
+++ b/builtin/check-ignore.c
@@ -8,7 +8,7 @@
static int quiet, verbose, stdin_paths, show_non_matching, no_index;
static const char * const check_ignore_usage[] = {
"git check-ignore [<options>] <pathname>...",
-"git check-ignore [<options>] --stdin < <list-of-paths>",
+"git check-ignore [<options>] --stdin",
NULL
};
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 25aa2cd..8747c0f 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -10,7 +10,7 @@
#include "utf8.h"
#include "gpg-interface.h"
-static const char commit_tree_usage[] = "git commit-tree [(-p <sha1>)...] [-S[<keyid>]] [-m <message>] [-F <file>] <sha1> <changelog";
+static const char commit_tree_usage[] = "git commit-tree [(-p <sha1>)...] [-S[<keyid>]] [-m <message>] [-F <file>] <sha1>";
static const char *sign_commit;
diff --git a/builtin/get-tar-commit-id.c b/builtin/get-tar-commit-id.c
index 6f4147a..e21c541 100644
--- a/builtin/get-tar-commit-id.c
+++ b/builtin/get-tar-commit-id.c
@@ -8,7 +8,7 @@
#include "quote.h"
static const char builtin_get_tar_commit_id_usage[] =
-"git get-tar-commit-id < <tarfile>";
+"git get-tar-commit-id";
/* ustar header + extended global header content */
#define RECORDSIZE (512)
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 07fef3c..43b098b 100644
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -78,7 +78,7 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
{
static const char * const hash_object_usage[] = {
N_("git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] [--] <file>..."),
- N_("git hash-object --stdin-paths < <list-of-paths>"),
+ N_("git hash-object --stdin-paths"),
NULL
};
const char *type = blob_type;
diff --git a/builtin/mktag.c b/builtin/mktag.c
index 640ab64..031b750 100644
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -154,7 +154,7 @@ int cmd_mktag(int argc, const char **argv, const char *prefix)
unsigned char result_sha1[20];
if (argc != 1)
- usage("git mktag < signaturefile");
+ usage("git mktag");
if (strbuf_read(&buf, 0, 4096) < 0) {
die_errno("could not read from stdin");
diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index ba34dac..366ce5a 100644
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -165,7 +165,7 @@ static void generate_id_list(int stable)
strbuf_release(&line_buf);
}
-static const char patch_id_usage[] = "git patch-id [--stable | --unstable] < patch";
+static const char patch_id_usage[] = "git patch-id [--stable | --unstable]";
static int git_patch_id_config(const char *var, const char *value, void *cb)
{
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 131ef28..264c392 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -8,7 +8,7 @@
static const char * const show_ref_usage[] = {
N_("git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"),
- N_("git show-ref --exclude-existing[=<pattern>] < <ref-list>"),
+ N_("git show-ref --exclude-existing[=<pattern>]"),
NULL
};
diff --git a/builtin/stripspace.c b/builtin/stripspace.c
index a8b7a93..7ff8434 100644
--- a/builtin/stripspace.c
+++ b/builtin/stripspace.c
@@ -14,8 +14,8 @@ static void comment_lines(struct strbuf *buf)
}
static const char * const stripspace_usage[] = {
- N_("git stripspace [-s | --strip-comments] < input"),
- N_("git stripspace [-c | --comment-lines] < input"),
+ N_("git stripspace [-s | --strip-comments]"),
+ N_("git stripspace [-c | --comment-lines]"),
NULL
};
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 7cc086f..7c3e79c 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -13,7 +13,7 @@
#include "fsck.h"
static int dry_run, quiet, recover, has_errors, strict;
-static const char unpack_usage[] = "git unpack-objects [-n] [-q] [-r] [--strict] < pack-file";
+static const char unpack_usage[] = "git unpack-objects [-n] [-q] [-r] [--strict]";
/* We always read in 4kB chunks. */
static unsigned char buffer[4096];