Merge branch 'jc/makefile'

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

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 63c1dbe812e6078870569c0b8d03ff021e4b56a3..ebaee4b3348ce9f7a4fcac6d9726a0251c51df72 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -14,18 +14,17 @@ DESCRIPTION
 -----------
 Shows the commit logs.
 
 -----------
 Shows the commit logs.
 

-The command takes options applicable to the gitlink:git-rev-list[1]
+The command takes options applicable to the linkgit:git-rev-list[1]

 command to control what is shown and how, and options applicable to
 command to control what is shown and how, and options applicable to

-the gitlink:git-diff-tree[1] commands to control how the changes
+the linkgit:git-diff-tree[1] commands to control how the changes

 each commit introduces are shown.
 
 each commit introduces are shown.
 

-This manual page describes only the most frequently used options.
-

 
 OPTIONS
 -------
 
 
 OPTIONS
 -------
 

-include::pretty-options.txt[]
+:git-log: 1
+include::diff-options.txt[]

 
 -<n>::
        Limits the number of commits to show.
 
 -<n>::
        Limits the number of commits to show.


@@ -36,20 +35,7 @@ include::pretty-options.txt[]
        `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
        `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.
-
--g, \--walk-reflogs::
-       Show commits as they were recorded in the reflog. The log contains
-       a record about how the tip of a reference was changed.
-       See also gitlink:git-reflog[1].
+       linkgit:git-rev-parse[1].

 
 --decorate::
        Print out the ref names of any commits that are shown.
 
 --decorate::
        Print out the ref names of any commits that are shown.


@@ -64,12 +50,22 @@ include::pretty-options.txt[]
 --follow::
        Continue listing the history of a file beyond renames.
 
 --follow::
        Continue listing the history of a file beyond renames.
 

+--log-size::
+       Before the log message print out its size in bytes. Intended
+       mainly for porcelain tools consumption. If git is unable to
+       produce a valid value size is set to zero.
+       Note that only message is considered, if also a diff is shown
+       its size is not included.
+

 <paths>...::
        Show only commits that affect the specified paths.
 
 
 <paths>...::
        Show only commits that affect the specified paths.
 
 

+include::rev-list-options.txt[]
+

 include::pretty-formats.txt[]
 
 include::pretty-formats.txt[]
 

+include::diff-generate-patch.txt[]

 
 Examples
 --------
 
 Examples
 --------


@@ -88,7 +84,7 @@ git log --since="2 weeks ago" \-- gitk::
        The "--" is necessary to avoid confusion with the *branch* named
        'gitk'
 
        The "--" is necessary to avoid confusion with the *branch* named
        'gitk'
 

-git log -r --name-status release..test::
+git log --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
 
        Show the commits that are in the "test" branch but not yet
        in the "release" branch, along with the list of paths


@@ -116,4 +112,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
 
 GIT
 ---

-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite