Junio C Hamano <gitster@xxxxxxxxx> writes: > John Szakmeister <john@xxxxxxxxxxxxxxx> writes: > >> On Thu, Jun 27, 2013 at 1:27 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> [snip] >>>> diff --git a/git-am.sh b/git-am.sh >>>> index 9f44509..ad67194 100755 >>>> --- a/git-am.sh >>>> +++ b/git-am.sh >>>> @@ -16,8 +16,8 @@ s,signoff add a Signed-off-by line to the commit message >>>> u,utf8 recode into utf8 (default) >>>> k,keep pass -k flag to git-mailinfo >>>> keep-non-patch pass -b flag to git-mailinfo >>>> -keep-cr pass --keep-cr flag to git-mailsplit for mbox format >>>> -no-keep-cr do not pass --keep-cr flag to git-mailsplit >>>> independent of am.keepcr >>>> +keep-cr pass --keep-cr flag to git mailsplit for mbox format >>>> +no-keep-cr do not pass --keep-cr flag to git mailsplit >>>> independent of am.keepcr >>>> c,scissors strip everything before a scissors line >>>> whitespace= pass it through git-apply >>>> ignore-space-change pass it through git-apply >>> >>>> As you were saying yourself, we tell users to prefer the "git foo" >>>> form, so we should also do so in the "git am" option help, IMHO. >>> >>> What does the above change to the options-help have anything to do >>> with that theme? It does not seem to say anything about "git foo" >>> vs "git-foo"? >> >> I initially missed it too, but `git-mailsplit` changed to `git >> mailsplit` in the help. > > Ahh, OK. > >> Now that I look at it more, I see that >> `git-mailinfo` was missed and there's a `git-apply` towards the >> bottom. So I'm not sure it's helping the consistency argument. > > Hmph, true. Having said that, I'd still prefer to see documentation changes in a patch separate from a "do not call git-foo form" patch. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html