Quoting Jakub Narebski <jnareb@xxxxxxxxx>: > Jari Aalto <jari.aalto@xxxxxxxxx> writes: >> >> -USAGE='[--interactive | -i] [-v] [--onto <newbase>] <upstream> [<branch>]' >> +USAGE='[-i|--interactive] [-v|--verbose] >> +[--whitespace={nowarn|warn|error|error-all|strip}] > > I would say "[--whitespace=<option>]" or "[--whitespace=<action>]" > instead of introducing yet not agreed upon notation (this has the > advantage of shortening synopisis, which should be short IMHO). > > Besides here the mutually exclusive options are naturelly delimited, > so you can say just (I think): > [--whitespace=nowarn|warn|error|error-all|strip] > >> +[-m|--merge] [--onto <newbase>] <upstream> [<branch>]' >> + I tried to run "git rebase --interactive --whitespace=strip" but it does not seem to strip blank characters at the end of my lines. Did I find a bug? -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ ---------------------------------------------------------------------- Find out how you can get spam free email. http://www.bluebottle.com/tag/3 - 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