diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-12 15:45:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-12 15:45:58 -0700 |
| commit | f629c233e6dd72924ed2672db142708b71dc663e (patch) | |
| tree | 278174a5628b3e30efaea6491d883e1cc596352f /Documentation/git-merge-file.txt | |
| parent | Merge branch 'jc/am-3-nonstandard-popt' into maint (diff) | |
| parent | gitweb: Fix fixed string (non-regexp) project search (diff) | |
| download | tgif-f629c233e6dd72924ed2672db142708b71dc663e.tar.xz | |
Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into maint
"gitweb" did use quotemeta() to prepare search string when asked to
do a fixed-string project search, but did not use it by mistake and
used the user-supplied string instead.
By Jakub Narebski
* jn/maint-do-not-match-with-unsanitized-searchtext:
gitweb: Fix fixed string (non-regexp) project search
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions