X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-log.txt;h=ebaee4b3348ce9f7a4fcac6d9726a0251c51df72;hb=7064ca51b08304d56bf57d2cceb2884f1abf66e5;hp=5920d1799acd2fe84e302b005695e2c795ecad36;hpb=05e74f4111b5ce5995dd1145f83398fe40a318e0;p=git.git diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 5920d1799..ebaee4b33 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -14,19 +14,15 @@ DESCRIPTION ----------- 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 -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. -This manual page describes only the most frequently used options. - OPTIONS ------- -include::pretty-options.txt[] - :git-log: 1 include::diff-options.txt[] @@ -39,18 +35,7 @@ include::diff-options.txt[] `HEAD`, i.e. the tip of the current branch. For a more complete list of ways to spell and , 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. - --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. - Cannot be combined with --reverse. - See also gitlink:git-reflog[1]. + linkgit:git-rev-parse[1]. --decorate:: Print out the ref names of any commits that are shown. @@ -76,6 +61,8 @@ include::diff-options.txt[] Show only commits that affect the specified paths. +include::rev-list-options.txt[] + include::pretty-formats.txt[] include::diff-generate-patch.txt[] @@ -125,4 +112,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list