[PATCH/RFC 02/12] grep docs: grep accepts a <tree-ish>, not a <tree>
From: Mark Lodato <hidden>
Date: 2016-06-15 22:48:25
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Also document that -p accepts a <commit> in the usage message. Signed-off-by: Mark Lodato <redacted> --- Documentation/git-grep.txt | 4 ++-- builtin/commit-tree.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 4b32322..02d6306 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt@@ -21,7 +21,7 @@ SYNOPSIS [-A <post-context>] [-B <pre-context>] [-C <context>] [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>...] - [--cached | --no-index | <tree>...] + [--cached | --no-index | <tree-ish>...] [--] [<pathspec>...] DESCRIPTION
@@ -168,7 +168,7 @@ OPTIONS Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't. -<tree>...:: +<tree-ish>...:: Instead of searching tracked files in the working tree, search blobs in the given trees.
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 96a421e..770baa2 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c@@ -22,7 +22,7 @@ static void check_valid(unsigned char *sha1, enum object_type expect) typename(expect)); } -static const char commit_tree_usage[] = "git commit-tree <sha1> [-p <sha1>]* < changelog"; +static const char commit_tree_usage[] = "git commit-tree <tree-ish> [-p <commit>]* < changelog"; static void new_parent(struct commit *parent, struct commit_list **parents_p) {
--
1.7.0.2