Subject: Re: [PATCH] Do not call built-in aliases from scripts

From: John Keeping <[email-masked]>
Date: Thu, 27 Jun 2013 19:11:54 +0100

On Thu, Jun 27, 2013 at 11:05:09AM -0700, Junio C Hamano wrote:
> John Szakmeister <[email-masked]> writes:
> 
> > On Thu, Jun 27, 2013 at 1:27 PM, Junio C Hamano <[email-masked]> 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.

That is rendered differently though, I don't think just having the plain
text git command is as useful.  It should either use the hyphenated form
or enclose the text in quotes.