Merge branch 'cb/send-email-help'

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

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index de5c0d37a5c1c8c948aa01e276c3e198eb617be6..249fc878ec2058f9fcfc6655ecaeb299ba5622a7 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -8,6 +8,7 @@ git-log - Show commit logs
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

+[verse]

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


@@ -68,10 +69,13 @@ produced by --stat etc.
        its size is not included.
 
 [\--] <path>...::
        its size is not included.
 
 [\--] <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.
+       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.

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


@@ -87,45 +91,45 @@ include::diff-generate-patch.txt[]
 
 Examples
 --------
 
 Examples
 --------

-git log --no-merges::
+`git log --no-merges`::

 
        Show the whole commit history, but skip any merges
 
 
        Show the whole commit history, but skip any merges
 

-git log v2.6.12.. include/scsi drivers/scsi::
+`git log v2.6.12.. include/scsi drivers/scsi`::

 
        Show all commits since version 'v2.6.12' that changed any file
        in the include/scsi or drivers/scsi subdirectories
 
 
        Show all commits since version 'v2.6.12' that changed any file
        in the include/scsi or drivers/scsi subdirectories
 

-git log --since="2 weeks ago" \-- gitk::
+`git log --since="2 weeks ago" \-- gitk`::

 
        Show the changes during the last two weeks to the file 'gitk'.
        The "--" is necessary to avoid confusion with the *branch* named
        'gitk'
 
 
        Show the changes during the last two weeks to the file 'gitk'.
        The "--" is necessary to avoid confusion with the *branch* named
        'gitk'
 

-git log --name-status release..test::
+`git log --name-status release..test`::

 
        Show the commits that are in the "test" branch but not yet
        in the "release" branch, along with the list of paths
        each commit modifies.
 
 
        Show the commits that are in the "test" branch but not yet
        in the "release" branch, along with the list of paths
        each commit modifies.
 

-git log --follow builtin-rev-list.c::
+`git log --follow builtin-rev-list.c`::

 
        Shows the commits that changed builtin-rev-list.c, including
        those commits that occurred before the file was given its
        present name.
 
 
        Shows the commits that changed builtin-rev-list.c, including
        those commits that occurred before the file was given its
        present name.
 

-git log --branches --not --remotes=origin::
+`git log --branches --not --remotes=origin`::

 
        Shows all commits that are in any of local branches but not in
        any of remote-tracking branches for 'origin' (what you have that
        origin doesn't).
 
 
        Shows all commits that are in any of local branches but not in
        any of remote-tracking branches for 'origin' (what you have that
        origin doesn't).
 

-git log master --not --remotes=*/master::
+`git log master --not --remotes=*/master`::

 
        Shows all commits that are in local master but not in any remote
        repository master branches.
 
 
        Shows all commits that are in local master but not in any remote
        repository master branches.
 

-git log -p -m --first-parent::
+`git log -p -m --first-parent`::

 
        Shows the history including change diffs, but only from the
        "main branch" perspective, skipping commits that come from merged
 
        Shows the history including change diffs, but only from the
        "main branch" perspective, skipping commits that come from merged