Merge branch 'es/blame-L-twice'
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2013 21:35:11 +0000 (14:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2013 21:35:11 +0000 (14:35 -0700)
Teaches "git blame" to take more than one -L ranges.

* es/blame-L-twice:
line-range: reject -L line numbers less than 1
t8001/t8002: blame: add tests of -L line numbers less than 1
line-range: teach -L^:RE to search from start of file
line-range: teach -L:RE to search from end of previous -L range
line-range: teach -L^/RE/ to search from start of file
line-range-format.txt: document -L/RE/ relative search
log: teach -L/RE/ to search from end of previous -L range
blame: teach -L/RE/ to search from end of previous -L range
line-range: teach -L/RE/ to search relative to anchor point
blame: document multiple -L support
t8001/t8002: blame: add tests of multiple -L options
blame: accept multiple -L ranges
blame: inline one-line function into its lone caller
range-set: publish API for re-use by git-blame -L
line-range-format.txt: clarify -L:regex usage form
git-log.txt: place each -L option variation on its own line

1  2 
builtin/blame.c
diff --cc builtin/blame.c
Simple merge