diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 22:23:53 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 22:23:53 +0400 |
| commit | e9682cc028e4d360dcf1364691095accc75f4b74 (patch) | |
| tree | e63f065122dc868da2a7c0dc1f5e90e1980c831a /Documentation | |
| parent | cb29dfde484e459e4329281151b05ef1c5ad462c (diff) | |
| parent | df83d5cf6759541d6f3d94b29a91fd0d3e5dbcd5 (diff) | |
Merge branch 'es/blame-L-breakage'
The refactoring made for parsing "-L" option recently to support
"git log -L" seems to have broken "git blame -L X,-5" to show 5
lines leading to X.
* es/blame-L-breakage:
blame-options.txt: explain that -L <start> and <end> are optional
blame-options.txt: place each -L option variation on its own line
t8001/t8002 (blame): add blame -L :funcname tests
t8001/t8002 (blame): add blame -L tests
t8001/t8002 (blame): modernize style
line-range: fix "blame -L X,-N" regression
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/blame-options.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index e9f984ba01..4e55b1564e 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@ -9,9 +9,13 @@ --show-stats:: Include additional statistics at the end of blame output. --L <start>,<end>, -L :<regex>:: - Annotate only the given line range. <start> and <end> can take - one of these forms: +-L <start>,<end>:: +-L :<regex>:: + Annotate only the given line range. <start> and <end> are optional. + ``-L <start>'' or ``-L <start>,'' spans from <start> to end of file. + ``-L ,<end>'' spans from start of file to <end>. ++ +<start> and <end> can take one of these forms: include::line-range-format.txt[] |