{"thread":{"id":"21029","subject":"[PATCH] Documentation: Update the style of 'git-describe' command.","startedAt":"2009-09-22T23:48:06Z","lastAt":"2009-09-23T01:24:58Z","messageCount":3,"participants":["Thiago Farina","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"123654","messageId":"1253663286-5919-1-git-send-email-tfransosi@gmail.com","threadId":"21029","inReplyTo":null,"subject":"[PATCH] Documentation: Update the style of 'git-describe' command.","fromName":"Thiago Farina","fromEmail":"tfransosi@gmail.com","sentAt":"2009-09-22T23:48:06Z","receivedAt":"2009-09-22T23:48:06Z","isPatch":true,"sender":{"key":"tfransosi@gmail.com","avatar":"https://avatars.githubusercontent.com/u/970071?v=4"},"body":"Update the old version 'git-describe' that appears in the documentation.\nSince the new version is prefered, use 'git describe' instead.\n\nAlso changes 'committish' to 'commit-ish', since the latter form is the most\nused.\n\nSigned-off-by: Thiago Farina <tfransosi@gmail.com>\n---\n Documentation/gitcli.txt |    2 +-\n builtin-describe.c       |    2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt\nindex be39ed7..b6c0637 100644\n--- a/Documentation/gitcli.txt\n+++ b/Documentation/gitcli.txt\n@@ -81,7 +81,7 @@ couple of magic command line options:\n +\n ---------------------------------------------\n $ git describe -h\n-usage: git-describe [options] <committish>*\n+usage: git describe [options] <commit-ish>*\n \n     --contains            find the tag that comes after the commit\n     --debug               debug search strategy on stderr\ndiff --git a/builtin-describe.c b/builtin-describe.c\nindex df67a73..961deb4 100644\n--- a/builtin-describe.c\n+++ b/builtin-describe.c\n@@ -10,7 +10,7 @@\n #define MAX_TAGS\t(FLAG_BITS - 1)\n \n static const char * const describe_usage[] = {\n-\t\"git describe [options] <committish>*\",\n+\t\"git describe [options] <commit-ish>*\",\n \tNULL\n };\n \n-- \n1.6.5.rc1.44.ga1675\n"},{"id":"123656","messageId":"7v3a6eo759.fsf@alter.siamese.dyndns.org","threadId":"21029","inReplyTo":"1253663286-5919-1-git-send-email-tfransosi@gmail.com","subject":"Re: [PATCH] Documentation: Update the style of 'git-describe' command.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-09-23T00:07:46Z","receivedAt":"2009-09-23T00:07:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thiago Farina <tfransosi@gmail.com> writes:\n\n>  $ git describe -h\n> -usage: git-describe [options] <committish>*\n> +usage: git describe [options] <commit-ish>*\n\nI think the first half of this line is correct but the other half is not.\n\n$ git grep --color -c -e committish -- Documentation/\nDocumentation/git-describe.txt:6\nDocumentation/git-fast-import.txt:8\nDocumentation/git-name-rev.txt:1\nDocumentation/git-shortlog.txt:1\nDocumentation/gitcli.txt:1\nDocumentation/howto/revert-branch-rebase.txt:1\n\n$ git grep --color -c -e commit-ish -- Documentation/\nDocumentation/git-rebase.txt:1\nDocumentation/git.txt:2\n"},{"id":"123658","messageId":"a4c8a6d00909221824u617a9812j11af45b39e06c6d5@mail.gmail.com","threadId":"21029","inReplyTo":"7v3a6eo759.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Documentation: Update the style of 'git-describe' command.","fromName":"Thiago Farina","fromEmail":"tfransosi@gmail.com","sentAt":"2009-09-23T01:24:58Z","receivedAt":"2009-09-23T01:24:58Z","isPatch":true,"sender":{"key":"tfransosi@gmail.com","avatar":"https://avatars.githubusercontent.com/u/970071?v=4"},"body":"On Tue, Sep 22, 2009 at 8:07 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> Thiago Farina <tfransosi@gmail.com> writes:\n>\n>>  $ git describe -h\n>> -usage: git-describe [options] <committish>*\n>> +usage: git describe [options] <commit-ish>*\n>\n> I think the first half of this line is correct but the other half is not.\n>\n> $ git grep --color -c -e committish -- Documentation/\n> Documentation/git-describe.txt:6\n> Documentation/git-fast-import.txt:8\n> Documentation/git-name-rev.txt:1\n> Documentation/git-shortlog.txt:1\n> Documentation/gitcli.txt:1\n> Documentation/howto/revert-branch-rebase.txt:1\n>\n> $ git grep --color -c -e commit-ish -- Documentation/\n> Documentation/git-rebase.txt:1\n> Documentation/git.txt:2\nI did this:\ngit$ grep --color -n \"commit-ish\" *.c\nbuiltin-revert.c:29:\t\"git revert [options] <commit-ish>\",\nbuiltin-revert.c:34:\t\"git cherry-pick [options] <commit-ish>\",\nbuiltin-send-pack.c:368:\t\t * (3) if both new and old are commit-ish,\nand new is a\nremote.c:1388:\t/* Both new and old must be commit-ish and new is descendant of\n\ngit$ grep --color -n \"committish\" *.c\nbuiltin-describe.c:13:\t\"git describe [options] <committish>*\",\nbuiltin-merge.c:885:\t * committish that is the same as HEAD there instead.\n"}]}