diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-19 14:41:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-19 14:41:29 -0700 |
| commit | d3ac359841969199397c36b4085ca3afd527b4d5 (patch) | |
| tree | ca6e636d7e5b45d2dec404c62fde79584ae7aafe /Documentation | |
| parent | 204ea3cad443df4f14623a09ee8201a552f067af (diff) | |
| parent | 2d893dff4c3c49750557da7a1701b46c1fe95844 (diff) | |
| download | git-d3ac359841969199397c36b4085ca3afd527b4d5.tar.gz git-d3ac359841969199397c36b4085ca3afd527b4d5.tar.xz | |
Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint
The "rev-parse --parseopt" mode parsed the option specification
and the argument hint in a strange way to allow '=' and other
special characters in the option name while forbidding them from
the argument hint. This made it impossible to define an option
like "--pair <key>=<value>" with "pair=key=value" specification,
which instead would have defined a "--pair=key <value>" option.
* ib/scripted-parse-opt-better-hint-string:
rev-parse --parseopt: allow [*=?!] in argument hints
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rev-parse.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index c483100e7..b6c6326cd 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -311,8 +311,8 @@ Each line of options has this format: `<opt-spec>`:: its format is the short option character, then the long option name separated by a comma. Both parts are not required, though at least one - is necessary. `h,help`, `dry-run` and `f` are all three correct - `<opt-spec>`. + is necessary. May not contain any of the `<flags>` characters. + `h,help`, `dry-run` and `f` are examples of correct `<opt-spec>`. `<flags>`:: `<flags>` are of `*`, `=`, `?` or `!`. |