diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:35:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:35:11 -0700 |
| commit | de9a25354aa22aa6796787f3ef3af276fba82339 (patch) | |
| tree | 9cfa7f20323b853773576582322b4d209f40e93e /builtin/merge-file.c | |
| parent | Merge branch 'tr/log-full-diff-keep-true-parents' (diff) | |
| parent | line-range: reject -L line numbers less than 1 (diff) | |
| download | tgif-de9a25354aa22aa6796787f3ef3af276fba82339.tar.xz | |
Merge branch 'es/blame-L-twice'
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
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions