Merge branch 'mm/usage-log-l-can-take-regex'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:00:36 +0000 (21:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:00:36 +0000 (21:00 -0700)
Documentation fix.

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

1  2 
Documentation/blame-options.txt
Documentation/git-log.txt
line-log.c
Simple merge
Simple merge
diff --cc line-log.c
Simple merge