Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3
commit811ce1b47c5486fa3348617d062e2eb4593962a1
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:34:01 +0000 (11 14:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:34:01 +0000 (11 14:34 -0700)
tree431dd9d5d47b7ef6b38df1cec32209324529d23a
parentcd0120857b8112258cef72c0f5adb7f8e8df7c1c
parent0269f968b7effea8a4f61f1fb0ac7e9386a9d90c
Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3

Documentation fix.

* mm/usage-log-l-can-take-regex:
  log -L: improve error message on malformed argument
  Documentation: change -L:<regex> to -L:<funcname>