config.txt: Document core.autocrlf

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

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 79643ac928b05b4a97a09a5adfb67b1b4a2b832c..030edaf305a620935840b3ffdcc0ca546d4e43da 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -16,7 +16,7 @@ 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 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
+the gitlink:git-diff-tree[1] commands to control how the changes

 each commit introduces are shown.
 
 This manual page describes only the most frequently used options.
 each commit introduces are shown.
 
 This manual page describes only the most frequently used options.


@@ -27,11 +27,21 @@ OPTIONS
 
 include::pretty-formats.txt[]
 
 
 include::pretty-formats.txt[]
 

---max-count=<n>::
+-<n>::

        Limits the number of commits to show.
 
 <since>..<until>::
        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.
+       For a more complete list of ways to spell <since>
+       and <until>, see "SPECIFYING REVISIONS" section in
+       gitlink:git-rev-parse[1].
+
+--first-parent::
+       Follow only the first parent commit upon seeing a merge
+       commit.  This  option gives a better overview of the
+       evolution of a particular branch.

 
 -p::
        Show the change the commit introduces in a patch form.
 
 -p::
        Show the change the commit introduces in a patch form.


@@ -63,6 +73,12 @@ git log -r --name-status release..test::
        in the "release" branch, along with the list of paths
        each commit modifies.
 
        in the "release" branch, along with the list of paths
        each commit modifies.
 

+Discussion
+----------
+
+include::i18n.txt[]
+
+

 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>