From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Thu, 13 Oct 2022 15:39:22 +0000 (+0200)
Subject: doc txt & -h consistency: make "diff-tree" consistent
X-Git-Tag: v2.39.0-rc0~73^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=320ee66de849459090b024137de027ead71c9723;p=thirdparty%2Fgit.git

doc txt & -h consistency: make "diff-tree" consistent

Make the "diff-tree -h" output consistent with the *.txt version.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index 23f58702fa..85e8c81e59 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -83,8 +83,9 @@ static int diff_tree_stdin(char *line)
 }
 
 static const char diff_tree_usage[] =
-"git diff-tree [--stdin] [-m] [-c | --cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
-"[<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\n"
+"git diff-tree [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
+"              [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
+"              [<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\n"
 "\n"
 "  -r            diff recursively\n"
 "  -c            show combined diff for merge commits\n"