diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-09 13:05:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-09 13:05:47 -0700 |
| commit | 0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f (patch) | |
| tree | 3266384afc1dc4717f49b1bd77f9ab734cacf8a0 /builtin/notes.c | |
| parent | d7d1c79cec6601db3a470e59240aa6ffab8b1405 (diff) | |
| parent | 497d9c343902591e98a6612385d529816420ea94 (diff) | |
| download | git-0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f.tar.gz | |
Merge branch 'maint'
* maint:
gitweb: clarify search results page when no matching commit found
Documentation: add a FILES section for show-ref
Makefile: add missing dependency on http.h
Makefile: add missing dependencies on url.h
Documentation/git-log: Clarify --full-diff
git-rebase: fix typo when parsing --force-rebase
imap-send: Fix sprintf usage
prune: allow --dry-run for -n and --verbose for -v
notes: allow --dry-run for -n and --verbose for -v
Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C
Documentation: cite git-am from git-apply
t7003: fix subdirectory-filter test
Allow "check-ref-format --branch" from subdirectory
check-ref-format: handle subcommands in separate functions
pretty-options.txt: match --format's documentation with implementation.
Diffstat (limited to 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index 190005f3cd..fbc347c9f0 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -798,8 +798,9 @@ static int prune(int argc, const char **argv, const char *prefix) struct notes_tree *t; int show_only = 0, verbose = 0; struct option options[] = { - OPT_BOOLEAN('n', NULL, &show_only, "do not remove, show only"), - OPT_BOOLEAN('v', NULL, &verbose, "report pruned notes"), + OPT_BOOLEAN('n', "dry-run", &show_only, + "do not remove, show only"), + OPT_BOOLEAN('v', "verbose", &verbose, "report pruned notes"), OPT_END() }; |