{"thread":{"id":"20934","subject":"[PATCH] reflog: Usage documentation cleanup","startedAt":"2009-09-13T17:23:52Z","lastAt":"2009-09-13T17:23:52Z","messageCount":1,"participants":["Nelson Elhage"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"123070","messageId":"1252862632-17581-1-git-send-email-nelhage@mit.edu","threadId":"20934","inReplyTo":null,"subject":"[PATCH] reflog: Usage documentation cleanup","fromName":"Nelson Elhage","fromEmail":"nelhage@mit.edu","sentAt":"2009-09-13T17:23:52Z","receivedAt":"2009-09-13T17:23:52Z","isPatch":true,"sender":{"key":"nelhage@mit.edu","avatar":"https://avatars.githubusercontent.com/u/16725?v=4"},"body":"* Make git-reflog.txt and the builtin usage text consistent.\n* Make 'git reflog expire' not claim that 'show' takes the same\n  arguments as 'expire'.\n* Document -n as an alias for --dry-run for the expire and delete\n  subcommands.\n---\n\n Documentation/git-reflog.txt |    5 +++--\n builtin-reflog.c             |    4 ++--\n 2 files changed, 5 insertions(+), 4 deletions(-)\n\nThanks to Jeff King and Erik Faye-Lund for both pointing out that 'git\nreflog expire' is probably wrong to be documenting the 'show' command\nin the first place, which makes this cleanup much saner.\n\ndiff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt\nindex 7f7a544..2c90c2c 100644\n--- a/Documentation/git-reflog.txt\n+++ b/Documentation/git-reflog.txt\n@@ -16,10 +16,11 @@ The command takes various subcommands, and different options\n depending on the subcommand:\n \n [verse]\n-'git reflog expire' [--dry-run] [--stale-fix] [--verbose]\n+'git reflog expire' [-n | --dry-run] [--stale-fix] [--verbose]\n \t[--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...\n +\n-'git reflog delete' ref@\\{specifier\\}...\n+'git reflog delete [--verbose] [-n | --dry-run] [--rewrite]\n+\t[--updateref] ref@\\{specifier}\\...'\n +\n 'git reflog' ['show'] [log-options] [<ref>]\n \ndiff --git a/builtin-reflog.c b/builtin-reflog.c\nindex 95198c5..4da5c6b 100644\n--- a/builtin-reflog.c\n+++ b/builtin-reflog.c\n@@ -13,9 +13,9 @@\n  */\n \n static const char reflog_expire_usage[] =\n-\"git reflog (show|expire) [--verbose] [--dry-run] [--stale-fix] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...\";\n+\"git reflog expire [--verbose] [-n | --dry-run] [--stale-fix] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...\";\n static const char reflog_delete_usage[] =\n-\"git reflog delete [--verbose] [--dry-run] [--rewrite] [--updateref] <refs>...\";\n+\"git reflog delete [--verbose] [-n | --dry-run] [--rewrite] [--updateref] ref@{specifier}...\";\n \n static unsigned long default_reflog_expire;\n static unsigned long default_reflog_expire_unreachable;\n-- \n1.6.3.1.499.ge7b8da\n"}]}