{"thread":{"id":"9646","subject":"[PATCH] Make usage documentation for git-blame and git-annotate consistent.","startedAt":"2007-08-26T03:19:51Z","lastAt":"2007-08-26T04:40:29Z","messageCount":2,"participants":["Brian Hetro","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"51540","messageId":"20070826031951.GB7644@ruiner","threadId":"9646","inReplyTo":null,"subject":"[PATCH] Make usage documentation for git-blame and git-annotate consistent.","fromName":"Brian Hetro","fromEmail":"whee@smaertness.net","sentAt":"2007-08-26T03:19:51Z","receivedAt":"2007-08-26T03:19:51Z","isPatch":true,"sender":{"key":"whee@smaertness.net","avatar":"https://gravatar.com/avatar/1d20c40734a674e76a0a58c6d122ef493291db306d613a40653a035084d557b9?d=mp&s=160"},"body":"Added git-annotate usage in the synopsis.  The extended information in\nthe git-blame usage was removed, as no other builtin does this and it\njust repeats what is in the full documentation.\n\nSigned-off-by: Brian Hetro <whee@smaertness.net>\n---\n Documentation/git-annotate.txt |    5 ++++-\n Documentation/git-blame.txt    |    6 +++---\n builtin-blame.c                |   17 +----------------\n 3 files changed, 8 insertions(+), 20 deletions(-)\n\ndiff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt\nindex 02dc474..cd5faab 100644\n--- a/Documentation/git-annotate.txt\n+++ b/Documentation/git-annotate.txt\n@@ -7,7 +7,10 @@ git-annotate - Annotate file lines with commit info\n \n SYNOPSIS\n --------\n-git-annotate [options] file [revision]\n+[verse]\n+'git-annotate' [-b] [-l] [--root] [-t] [-p] [--incremental] [-L n,m]\n+               [-S <revs-file>] [-M] [-C] [-C] [--since=<date>]\n+               [<rev> | --contents <file>] [--] <file>\n \n DESCRIPTION\n -----------\ndiff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt\nindex 66f1203..e8ddfea 100644\n--- a/Documentation/git-blame.txt\n+++ b/Documentation/git-blame.txt\n@@ -8,9 +8,9 @@ git-blame - Show what revision and author last modified each line of a file\n SYNOPSIS\n --------\n [verse]\n-'git-blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]\n-            [-S <revs-file>] [-M] [-C] [-C] [--since=<date>]\n-            [<rev> | --contents <file>] [--] <file>\n+'git-blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w]\n+            [--incremental] [-L n,m] [-S <revs-file>] [-M] [-C] [-C]\n+            [--since=<date>] [<rev> | --contents <file>] [--] <file>\n \n DESCRIPTION\n -----------\ndiff --git a/builtin-blame.c b/builtin-blame.c\nindex 0519339..222eba5 100644\n--- a/builtin-blame.c\n+++ b/builtin-blame.c\n@@ -20,22 +20,7 @@\n #include \"mailmap.h\"\n \n static char blame_usage[] =\n-\"git-blame [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--contents <filename>] [--incremental] [commit] [--] file\\n\"\n-\"  -c                  Use the same output mode as git-annotate (Default: off)\\n\"\n-\"  -b                  Show blank SHA-1 for boundary commits (Default: off)\\n\"\n-\"  -l                  Show long commit SHA1 (Default: off)\\n\"\n-\"  --root              Do not treat root commits as boundaries (Default: off)\\n\"\n-\"  -t                  Show raw timestamp (Default: off)\\n\"\n-\"  -f, --show-name     Show original filename (Default: auto)\\n\"\n-\"  -n, --show-number   Show original linenumber (Default: off)\\n\"\n-\"  -s                  Suppress author name and timestamp (Default: off)\\n\"\n-\"  -p, --porcelain     Show in a format designed for machine consumption\\n\"\n-\"  -w                  Ignore whitespace differences\\n\"\n-\"  -L n,m              Process only line range n,m, counting from 1\\n\"\n-\"  -M, -C              Find line movements within and across files\\n\"\n-\"  --incremental       Show blame entries as we find them, incrementally\\n\"\n-\"  --contents file     Use <file>'s contents as the final image\\n\"\n-\"  -S revs-file        Use revisions from revs-file instead of calling git-rev-list\\n\";\n+\"git-blame [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--since=<date>] [<rev> | --contents <file>] [--] <file>\";\n \n static int longest_file;\n static int longest_author;\n-- \n1.5.3.rc6.23.g0058-dirty\n"},{"id":"51544","messageId":"7vwsvisybm.fsf@gitster.siamese.dyndns.org","threadId":"9646","inReplyTo":"20070826031951.GB7644@ruiner","subject":"Re: [PATCH] Make usage documentation for git-blame and git-annotate consistent.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-08-26T04:40:29Z","receivedAt":"2007-08-26T04:40:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Brian Hetro <whee@smaertness.net> writes:\n\n> Added git-annotate usage in the synopsis.\n\nI'd rather not do this.  The git-annotate wrapper is a\ntransitional measure for backward compatibility, and I do not\nthink we should advertise the options that are added in\ngit-blame there, even though the command option parser is lazy\nand does not turn them off.  Ideally disabling non annotate\noptions would be a good thing to have if it were free, but I do\nnot think it is worth it.\n"}]}