diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:24 -0700 |
| commit | 2bf2d819e1ccd4865500e957cc5953de31255c46 (patch) | |
| tree | defd94f473ca2099749e9956777b405539bcb2b5 /t/t6037-merge-ours-theirs.sh | |
| parent | Merge branch 'mh/fast-import-optimize-current-from' (diff) | |
| parent | rev-parse --parseopt: allow [*=?!] in argument hints (diff) | |
| download | tgif-2bf2d819e1ccd4865500e957cc5953de31255c46.tar.xz | |
Merge branch 'ib/scripted-parse-opt-better-hint-string'
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 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions