Merge branch 'maint'

[git.git] / Documentation / git-log.txt

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 5a58d5b03ded77d04d3de0857a798b6d3193adb2..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
 -----------


@@ -41,10 +41,10 @@ include::diff-options.txt[]
        Print out the ref names of any commits that are shown.
 
 --full-diff::
        Print out the ref names of any commits that are shown.
 
 --full-diff::

-       Without this flag, "git log -p <paths>..." shows commits that
+       Without this flag, "git log -p <path>..." shows commits that

        touch the specified paths, and diffs about the same specified
        paths.  With this, the full diff is shown for commits that touch
        touch the specified paths, and diffs about the same specified
        paths.  With this, the full diff is shown for commits that touch

-       the specified paths; this means that "<paths>..." limits only
+       the specified paths; this means that "<path>..." limits only

        commits, and doesn't limit diff for those commits.
 
 --follow::
        commits, and doesn't limit diff for those commits.
 
 --follow::


@@ -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.
 

-<paths>...::
-       Show only commits that affect 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[]