Hi, On Mon, May 18, 2015 at 10:43 PM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > On 2015-05-18 15:54, Paul Tan wrote: > >> diff --git a/git-pull.sh b/git-pull.sh >> index 633c385..67f825c 100755 >> --- a/git-pull.sh >> +++ b/git-pull.sh >> @@ -4,13 +4,53 @@ >> # >> # Fetch one or more remote refs and merge it/them into the current HEAD. >> >> -USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] >> [--[no-]ff|--ff-only] [--[no-]rebase|--rebase=preserve] [-s >> strategy]... [<fetch-options>] <repo> <head>...' >> -LONG_USAGE='Fetch one or more remote refs and integrate it/them with >> the current HEAD.' >> SUBDIRECTORY_OK=Yes >> -OPTIONS_SPEC= >> +OPTIONS_KEEPDASHDASH=Yes > > I have to admit that I was puzzled by this at first. But it seems that the > intention is to handle a dashdash argument as an error, therefore we have to > keep it. Is my understanding correct?
Ugh, I thought we had to keep the dashdash so that we could disambiguate the arguments from the options, but it turns out that rev-parse would add its own dashdash. So, no, we don't need to keep the dashdash. Thanks for catching this. Fixed. Regards, Paul -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
