Merge branch 'es/line-log-further-fixes' into tr/line-log

* es/line-log-further-fixes:
line-log: fix "log -LN" crash when N is last line of file
range-set: satisfy non-empty ranges invariant
t4211: demonstrate crash when first -L encountered is empty range
t4211: demonstrate empty -L range crash
range-set: fix sort_and_merge_range_set() corner case bug
range_set: fix coalescing bug when range is a subset of another
t4211: fix broken test when one -L range is subset of another

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 4850226aaf16e14731e5571db95645d502fdfe2d..65707ce13ccfaba5034235439a5000eb826b6641 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -76,16 +76,11 @@ produced by --stat etc.
        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.
 
 [\--] <path>...::
        Show only commits that are enough to explain how the files