X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-log.txt;h=e995d1b74bdbcedf3cc656ee06e939ec39a87795;hb=8273c79ae2e6b782dba3dccb815b386cc83e4294;hp=13a3998302a2817bb36d7555f171311ce19a3d0c;hpb=d06b689a933f6d2130f8afdf1ac0ddb83eeb59ab;p=git.git

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 13a39983..e995d1b7 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -20,7 +20,7 @@ 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>::
@@ -30,6 +30,24 @@ OPTIONS
 	Show only commits between the named two commits.
 
 
+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'
+
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>