diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:23:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:23:40 -0800 |
| commit | 5b5710effa68e3901a44bb2e55485a4d8a89308f (patch) | |
| tree | 227760eb1db987c1eeb5d4a181de0012208821ac | |
| parent | 24065b827bcb96b0ca1eca8c9061f0efdde105f1 (diff) | |
| parent | e54b63359f9df44850bd50010e097f40e8cf3952 (diff) | |
| download | git-5b5710effa68e3901a44bb2e55485a4d8a89308f.tar.gz git-5b5710effa68e3901a44bb2e55485a4d8a89308f.tar.xz | |
Merge branch 'rd/doc-notes-prune-fix'
Doc update.
* rd/doc-notes-prune-fix:
notes: correct 'git notes prune' options to '[-n] [-v]'
| -rw-r--r-- | Documentation/git-notes.txt | 2 | ||||
| -rw-r--r-- | builtin/notes.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt index 43677297f..e8dec1b3c 100644 --- a/Documentation/git-notes.txt +++ b/Documentation/git-notes.txt @@ -18,7 +18,7 @@ SYNOPSIS 'git notes' merge --commit [-v | -q] 'git notes' merge --abort [-v | -q] 'git notes' remove [--ignore-missing] [--stdin] [<object>...] -'git notes' prune [-n | -v] +'git notes' prune [-n] [-v] 'git notes' get-ref diff --git a/builtin/notes.c b/builtin/notes.c index a2a542f82..1a2c7d92a 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -33,7 +33,7 @@ static const char * const git_notes_usage[] = { N_("git notes merge --commit [-v | -q]"), N_("git notes merge --abort [-v | -q]"), N_("git notes [--ref <notes-ref>] remove [<object>...]"), - N_("git notes [--ref <notes-ref>] prune [-n | -v]"), + N_("git notes [--ref <notes-ref>] prune [-n] [-v]"), N_("git notes [--ref <notes-ref>] get-ref"), NULL }; |