Improve git-log documentation wrt file filters

The need for "--" in the git-log synopsis was previously unclear and
confusing. This patch makes it a little clearer.

Thanks to hyy <yiyihu@gmail.com> for his help.

[sp: Changed -- to \-- per prior commit e1ccf53.]

Signed-off-by: martin f. krafft <madduck@madduck.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 0446bad7e589c06c97bb9274e9edd4b343ef9e55..93a2a227c4816720b82330aca1b8c3ab0245b1c1 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -8,7 +8,7 @@ git-log - Show commit logs
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git log' <option>...
+'git log' [<options>] [<since>..<until>] [[\--] <path>...]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -57,8 +57,11 @@ include::diff-options.txt[]
        Note that only message is considered, if also a diff is shown
        its size is not included.
 
        Note that only message is considered, if also a diff is shown
        its size is not included.
 

-<path>...::
-       Show only commits that affect any of the specified paths.
+[\--] <path>...::
+       Show only commits that affect any of the specified paths. To
+       prevent confusion with options and branch names, paths may need
+       to be prefixed with "\-- " to separate them from options or
+       refnames.

 
 
 include::rev-list-options.txt[]
 
 
 include::rev-list-options.txt[]