git-pull: disallow implicit merging to detached HEAD

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

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index e995d1b74bdbcedf3cc656ee06e939ec39a87795..60610f91f4c38946b35209bd3e9a1c696fd1b17d 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -12,22 +12,34 @@ 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>::
-       Controls the way the commit log is formatted.
 
---max-count=<n>::
+include::pretty-formats.txt[]
+
+-<n>::
        Limits the number of commits to show.
 
 <since>..<until>::
-       Show only commits between the named two commits.
+       Show only commits between the named two commits.  When
+       either <since> or <until> is omitted, it defaults to
+       `HEAD`, i.e. the tip of the current branch.
+
+-p::
+       Show the change the commit introduces in a patch form.
+
+<paths>...::
+       Show only commits that affect the specified paths.
 
 
 Examples
@@ -41,12 +53,23 @@ 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::
+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.
+
+Discussion
+----------
+
+include::i18n.txt[]
+
 
 Author
 ------