Merge remote-tracking branch 'vi-vnwildman/master'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 69db5783cef46dedabd1169f962fbcc92a028e4e..a976534ab870a89a236ec7190f985e20f771e7f7 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,14 +62,23 @@ produced by --stat etc.
        Note that only message is considered, if also a diff is shown
        its size is not included.
 
+<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
        that match the specified paths came to be.  See "History
        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[]