From: Thomas Rast Date: Tue, 29 Oct 2013 07:20:39 GMT Subject: [PATCH v2 6/7] Documentation: put blame/log -L in sticked form Message-ID: In-Reply-To: <21f40508f83a9407986d29f002adf5ad366c8b88.1382287779.git.trast@inf.ethz.ch> The next patch will document gitk -L, but gitk does not understand the separated form ('gitk -L :foo:bar' results in an error). Spell git-blame and git-log -L, which are supposed to be "the same" option, without the spaces to prevent confusion. Signed-off-by: Thomas Rast --- Documentation/blame-options.txt | 8 ++++---- Documentation/git-blame.txt | 8 ++++---- Documentation/git-log.txt | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index 0cebc4f..28ca95e 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@ -9,13 +9,13 @@ --show-stats:: Include additional statistics at the end of blame output. --L ,:: --L ::: +-L,:: +-L::: Annotate only the given line range. May be specified multiple times. Overlapping ranges are allowed. + - and are optional. ``-L '' or ``-L ,'' spans from - to end of file. ``-L ,'' spans from start of file to . + and are optional. ``-L'' or ``-L,'' spans from + to end of file. ``-L,'' spans from start of file to . + include::line-range-format.txt[] diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index f2c85cc..085dba1 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental] - [-L ] [-S ] [-M] [-C] [-C] [-C] [--since=] + [-L] [-S ] [-M] [-C] [-C] [-C] [--since=] [--abbrev=] [ | --contents | --reverse ] [--] DESCRIPTION @@ -139,12 +139,12 @@ lines 40-60 for file `foo`, you can use the `-L` option like so (they mean the same thing -- both ask for 21 lines starting at line 40): - git blame -L 40,60 foo - git blame -L 40,+21 foo + git blame -L40,60 foo + git blame -L40,+21 foo Also you can use a regular expression to specify the line range: - git blame -L '/^sub hello {/,/^}$/' foo + git blame -L'/^sub hello {/,/^}$/' foo which limits the annotation to the body of the `hello` subroutine. diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 34097ef..87c10fa 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -62,8 +62,8 @@ produced by --stat etc. Note that only message is considered, if also a diff is shown its size is not included. --L ,::: --L :::: +-L,::: +-L:::: Trace the evolution of the line range given by "," (or the funcname regex ) within the . You may @@ -152,7 +152,7 @@ EXAMPLES This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch. -`git log -L '/int main/',/^}/:main.c`:: +`git log -L'/int main/',/^}/:main.c`:: Shows how the function `main()` in the file 'main.c' evolved over time. -- 1.8.4.2.838.ga9a3e20