Merge branch 'jc/count' into next

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index e995d1b74bdbcedf3cc656ee06e939ec39a87795..af378ffcf9b09bd3ae01566e405aadec75c28e61 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -12,12 +12,16 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-Shows the commit logs.  This command internally invokes
-'git-rev-list', and the command line options are passed to that
-command.
+Shows the commit logs.
+
+The command takes options applicable to the gitlink:git-rev-list[1]
+command to control what is shown and how, and options applicable to
+the gitlink:git-diff-tree[1] commands to control how the change
+each commit introduces are shown.
 
 This manual page describes only the most frequently used options.
 
+
 OPTIONS
 -------
 --pretty=<format>::
@@ -29,6 +33,12 @@ OPTIONS
 <since>..<until>::
        Show only commits between the named two commits.
 
+-p::
+       Show the change the commit introduces in a patch form.
+
+<paths>...::
+       Show only commits that affect the specified paths.
+
 
 Examples
 --------
@@ -47,6 +57,11 @@ git log --since="2 weeks ago" -- gitk::
        The "--" is necessary to avoid confusion with the *branch* named
        'gitk'
 
+git log -r --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.
 
 Author
 ------