diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-10-13 17:39:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-13 18:32:57 +0200 |
| commit | 320ee66de849459090b024137de027ead71c9723 (patch) | |
| tree | 2a73a2bbc4869513c615622930a5d0dab0c28a7f /builtin/diff-tree.c | |
| parent | doc txt & -h consistency: use "[<label>...]" for "zero or more" (diff) | |
| download | git-320ee66de849459090b024137de027ead71c9723.tar.xz git-320ee66de849459090b024137de027ead71c9723.zip | |
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>
Diffstat (limited to 'builtin/diff-tree.c')
| -rw-r--r-- | builtin/diff-tree.c | 5 |
1 files changed, 3 insertions, 2 deletions
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" |