Merge branch 'kb/status-ignored-optim-2'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 8727c60ab36365c88040c17e7e487013bc5ac461..4687fe8192594b358f7058dcdec985ab30c2a3fb 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -9,7 +9,7 @@ git-log - Show commit logs
 SYNOPSIS
 --------
 [verse]
-'git log' [<options>] [<since>..<until>] [[\--] <path>...]
+'git log' [<options>] [<revision range>] [[\--] <path>...]
 
 DESCRIPTION
 -----------
@@ -24,13 +24,6 @@ each commit introduces are shown.
 OPTIONS
 -------
 
-<since>..<until>::
-       Show only commits between the named two commits.  When
-       either <since> or <until> is omitted, it defaults to
-       `HEAD`, i.e. the tip of the current branch.
-       For a more complete list of ways to spell <since>
-       and <until>, see linkgit:gitrevisions[7].
-
 --follow::
        Continue listing the history of a file beyond renames
        (works only for a single file).
@@ -69,22 +62,27 @@ produced by --stat etc.
        Note that only message is considered, if also a diff is shown
        its size is not included.
 
--L <start>,<end>:<file>::
-       Trace the evolution of the line range given by "<start>,<end>"
-       within the <file>.  You may not give any pathspec limiters.
-       This is currently limited to a walk starting from a single
-       revision, i.e., you may only give zero or one positive
-       revision arguments.
+-L <start>,<end>:<file>, -L :<regex>:<file>::
 
+       Trace the evolution of the line range given by "<start>,<end>"
+       (or the funcname regex <regex>) within the <file>.  You may
+       not give any pathspec limiters.  This is currently limited to
+       a walk starting from a single revision, i.e., you may only
+       give zero or one positive revision arguments.
+       You can specify this option more than once.
++
 <start> and <end> can take one of these forms:
 
 include::line-range-format.txt[]
-You can specify this option more than once.
-
 
---full-line-diff::
-       Always print the interesting range even if the current commit
-       does not change any line of the range.
+<revision range>::
+       Show only commits in the specified revision range.  When no
+       <revision range> is specified, it defaults to `HEAD` (i.e. the
+       whole history leading to the current commit).  `origin..HEAD`
+       specifies all the commits reachable from the current commit
+       (i.e. `HEAD`), but not from `origin`. For a complete list of
+       ways to spell <revision range>, see the "Specifying Ranges"
+       section of linkgit:gitrevisions[7].
 
 [\--] <path>...::
        Show only commits that are enough to explain how the files
@@ -92,8 +90,8 @@ You can specify this option more than once.
        Simplification" below for details and other simplification
        modes.
 +
-To prevent confusion with options and branch names, paths may need to
-be prefixed with "\-- " to separate them from options or refnames.
+Paths may need to be prefixed with "\-- " to separate them from
+options or the revision range, when confusion arises.
 
 include::rev-list-options.txt[]