diff options
Diffstat (limited to 'Documentation/git-log.txt')
| -rw-r--r-- | Documentation/git-log.txt | 65 |
1 files changed, 47 insertions, 18 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 030edaf305..34cf4e5811 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -8,24 +8,23 @@ git-log - Show commit logs SYNOPSIS -------- -'git-log' <option>... +'git log' [<options>] [<since>..<until>] [[\--] <path>...] DESCRIPTION ----------- Shows the commit logs. -The command takes options applicable to the gitlink:git-rev-list[1] +The command takes options applicable to the 'git-rev-list' 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 'git-diff-*' commands to control how the changes each commit introduces are shown. -This manual page describes only the most frequently used options. - OPTIONS ------- -include::pretty-formats.txt[] +:git-log: 1 +include::diff-options.txt[] -<n>:: Limits the number of commits to show. @@ -36,19 +35,44 @@ include::pretty-formats.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 - gitlink:git-rev-parse[1]. + linkgit:git-rev-parse[1]. + +--decorate:: + Print out the ref names of any commits that are shown. + +--source:: + Print out the ref name given on the command line by which each + commit was reached. + +--full-diff:: + Without this flag, "git log -p <path>..." shows commits that + touch the specified paths, and diffs about the same specified + paths. With this, the full diff is shown for commits that touch + the specified paths; this means that "<path>..." limits only + commits, and doesn't limit diff for those commits. + +--follow:: + Continue listing the history of a file beyond renames. ---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. +--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. --p:: - Show the change the commit introduces in a patch form. +[\--] <path>...:: + Show only commits that affect any of the specified paths. To + prevent confusion with options and branch names, paths may need + to be prefixed with "\-- " to separate them from options or + refnames. -<paths>...:: - Show only commits that affect the specified paths. +include::rev-list-options.txt[] + +include::pretty-formats.txt[] + +include::diff-generate-patch.txt[] Examples -------- @@ -67,12 +91,18 @@ git log --since="2 weeks ago" \-- 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 each commit modifies. +git log --follow builtin-rev-list.c:: + + Shows the commits that changed builtin-rev-list.c, including + those commits that occurred before the file was given its + present name. + Discussion ---------- @@ -89,5 +119,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the gitlink:git[7] suite - +Part of the linkgit:git[1] suite |