make oneline reflog dates more consistent with multiline format

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

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index db61bc96c7e23132c41bb75724d669a6224a3d76..34cf4e5811d1a6f46fcbd333a2ff48c200eadff8 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -8,15 +8,15 @@ git-log - Show commit logs
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

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

 
 DESCRIPTION
 -----------
 Shows the commit logs.
 
 
 DESCRIPTION
 -----------
 Shows the commit logs.
 

-The command takes options applicable to the linkgit:git-rev-list[1]
+The command takes options applicable to the 'git-rev-list'

 command to control what is shown and how, and options applicable to
 command to control what is shown and how, and options applicable to

-the linkgit:git-diff-tree[1] commands to control how the changes
+the 'git-diff-*' commands to control how the changes

 each commit introduces are shown.
 
 
 each commit introduces are shown.
 
 


@@ -40,11 +40,15 @@ include::diff-options.txt[]
 --decorate::
        Print out the ref names of any commits that are shown.
 
 --decorate::
        Print out the ref names of any commits that are shown.
 

+--source::
+       Print out the ref name given on the command line by which each
+       commit was reached.
+

 --full-diff::
 --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 +61,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[]