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>
Ævar Arnfjörð Bjarmason committed
Oct 13, 2022 at 17:39 UTC
320ee66de849459090b024137de027ead71c9723
1 file changed
+3
-2
builtin/diff-tree.c
+3
-2
@@ -83,8 +83,9 @@ static int diff_tree_stdin(char *line)
83
}
84
85
static const char diff_tree_usage[] =
86
-"git diff-tree [--stdin] [-m] [-c | --cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
87
-"[<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\n"
86
+"git diff-tree [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
87
+" [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
88
+" [<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\n"
89
"\n"
90
" -r diff recursively\n"
91
" -c show combined diff for merge commits\n"