X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-log.txt;h=c9ffff734c256d7db1470381f0eb74a8d7f81873;hb=7768e27e1d3f3d5e253e795433033b5de1d1c157;hp=16f48295c20951b35744f3a81d816e515568fff7;hpb=98438bd0e893c23186fb82ea8b04964c0f1ef9d1;p=git.git

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 16f48295c..c9ffff734 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -8,19 +8,23 @@ git-log - Show commit logs
 
 SYNOPSIS
 --------
-'git log' <option>...
+'git-log' <option>...
 
 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>:
+--pretty=<format>::
 	Controls the way the commit log is formatted.
 
 --max-count=<n>::
@@ -29,6 +33,35 @@ 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
+--------
+git log --no-merges::
+
+	Show the whole commit history, but skip any merges
+
+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
+
+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'
+
+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
 ------