2005-09-08 08:26:23 +08:00
|
|
|
git-log(1)
|
|
|
|
|
==========
|
2005-08-15 08:24:36 +08:00
|
|
|
|
|
|
|
|
NAME
|
|
|
|
|
----
|
2005-09-08 08:26:23 +08:00
|
|
|
git-log - Show commit logs
|
2005-08-15 08:24:36 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
--------
|
2011-07-02 10:38:26 +08:00
|
|
|
[verse]
|
2013-04-22 13:30:28 +08:00
|
|
|
'git log' [<options>] [<revision range>] [[\--] <path>...]
|
2005-08-15 08:24:36 +08:00
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
-----------
|
2006-04-15 03:59:09 +08:00
|
|
|
Shows the commit logs.
|
|
|
|
|
|
2013-11-13 14:21:49 +08:00
|
|
|
The command takes options applicable to the `git rev-list`
|
2006-04-15 03:59:09 +08:00
|
|
|
command to control what is shown and how, and options applicable to
|
2013-11-13 14:21:49 +08:00
|
|
|
the `git diff-*` commands to control how the changes
|
2006-04-15 03:59:09 +08:00
|
|
|
each commit introduces are shown.
|
|
|
|
|
|
2005-08-15 08:24:36 +08:00
|
|
|
|
|
|
|
|
OPTIONS
|
|
|
|
|
-------
|
2006-11-22 07:49:15 +08:00
|
|
|
|
2010-07-08 10:14:31 +08:00
|
|
|
--follow::
|
|
|
|
|
Continue listing the history of a file beyond renames
|
|
|
|
|
(works only for a single file).
|
|
|
|
|
|
2010-02-18 02:20:49 +08:00
|
|
|
--no-decorate::
|
2016-05-27 23:56:02 +08:00
|
|
|
--decorate[=short|full|auto|no]::
|
2009-08-15 22:23:12 +08:00
|
|
|
Print out the ref names of any commits that are shown. If 'short' is
|
|
|
|
|
specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and
|
|
|
|
|
'refs/remotes/' will not be printed. If 'full' is specified, the
|
2016-05-27 23:56:02 +08:00
|
|
|
full ref name (including prefix) will be printed. If 'auto' is
|
|
|
|
|
specified, then if the output is going to a terminal, the ref names
|
|
|
|
|
are shown as if 'short' were given, otherwise no ref names are
|
|
|
|
|
shown. The default option is 'short'.
|
2007-05-11 06:09:38 +08:00
|
|
|
|
2008-11-10 17:58:15 +08:00
|
|
|
--source::
|
|
|
|
|
Print out the ref name given on the command line by which each
|
|
|
|
|
commit was reached.
|
|
|
|
|
|
2013-01-06 05:26:43 +08:00
|
|
|
--use-mailmap::
|
|
|
|
|
Use mailmap file to map author and committer names and email
|
2013-11-13 14:21:49 +08:00
|
|
|
addresses to canonical real names and email addresses. See
|
2013-01-06 05:26:43 +08:00
|
|
|
linkgit:git-shortlog[1].
|
|
|
|
|
|
2007-06-17 03:03:38 +08:00
|
|
|
--full-diff::
|
2013-11-13 14:21:49 +08:00
|
|
|
Without this flag, `git log -p <path>...` shows commits that
|
2007-06-17 03:03:38 +08:00
|
|
|
touch the specified paths, and diffs about the same specified
|
|
|
|
|
paths. With this, the full diff is shown for commits that touch
|
2008-07-30 17:33:43 +08:00
|
|
|
the specified paths; this means that "<path>..." limits only
|
2007-06-17 03:03:38 +08:00
|
|
|
commits, and doesn't limit diff for those commits.
|
2010-08-08 23:31:34 +08:00
|
|
|
+
|
|
|
|
|
Note that this affects all diff-based output types, e.g. those
|
2013-11-13 14:21:49 +08:00
|
|
|
produced by `--stat`, etc.
|
2007-06-17 03:03:38 +08:00
|
|
|
|
2007-07-21 02:15:13 +08:00
|
|
|
--log-size::
|
2013-11-13 14:21:48 +08:00
|
|
|
Include a line ``log size <number>'' in the output for each commit,
|
|
|
|
|
where <number> is the length of that commit's message in bytes.
|
|
|
|
|
Intended to speed up tools that read log messages from `git log`
|
|
|
|
|
output by allowing them to allocate space in advance.
|
2007-07-21 02:15:13 +08:00
|
|
|
|
2013-08-06 21:59:34 +08:00
|
|
|
-L <start>,<end>:<file>::
|
2015-04-20 20:09:06 +08:00
|
|
|
-L :<funcname>:<file>::
|
Implement line-history search (git log -L)
This is a rewrite of much of Bo's work, mainly in an effort to split
it into smaller, easier to understand routines.
The algorithm is built around the struct range_set, which encodes a
series of line ranges as intervals [a,b). This is used in two
contexts:
* A set of lines we are tracking (which will change as we dig through
history).
* To encode diffs, as pairs of ranges.
The main routine is range_set_map_across_diff(). It processes the
diff between a commit C and some parent P. It determines which diff
hunks are relevant to the ranges tracked in C, and computes the new
ranges for P.
The algorithm is then simply to process history in topological order
from newest to oldest, computing ranges and (partial) diffs. At
branch points, we need to merge the ranges we are watching. We will
find that many commits do not affect the chosen ranges, and mark them
TREESAME (in addition to those already filtered by pathspec limiting).
Another pass of history simplification then gets rid of such commits.
This is wired as an extra filtering pass in the log machinery. This
currently only reduces code duplication, but should allow for other
simplifications and options to be used.
Finally, we hook a diff printer into the output chain. Ideally we
would wire directly into the diff logic, to optionally use features
like word diff. However, that will require some major reworking of
the diff chain, so we completely replace the output with our own diff
for now.
As this was a GSoC project, and has quite some history by now, many
people have helped. In no particular order, thanks go to
Jakub Narebski <jnareb@gmail.com>
Jens Lehmann <Jens.Lehmann@web.de>
Jonathan Nieder <jrnieder@gmail.com>
Junio C Hamano <gitster@pobox.com>
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Will Palmer <wmpalmer@gmail.com>
Apologies to everyone I forgot.
Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-29 00:47:32 +08:00
|
|
|
Trace the evolution of the line range given by "<start>,<end>"
|
2015-04-20 20:09:06 +08:00
|
|
|
(or the function name regex <funcname>) within the <file>. You may
|
2013-03-29 00:47:33 +08:00
|
|
|
not give any pathspec limiters. This is currently limited to
|
|
|
|
|
a walk starting from a single revision, i.e., you may only
|
|
|
|
|
give zero or one positive revision arguments.
|
2013-04-22 10:40:49 +08:00
|
|
|
You can specify this option more than once.
|
|
|
|
|
+
|
Implement line-history search (git log -L)
This is a rewrite of much of Bo's work, mainly in an effort to split
it into smaller, easier to understand routines.
The algorithm is built around the struct range_set, which encodes a
series of line ranges as intervals [a,b). This is used in two
contexts:
* A set of lines we are tracking (which will change as we dig through
history).
* To encode diffs, as pairs of ranges.
The main routine is range_set_map_across_diff(). It processes the
diff between a commit C and some parent P. It determines which diff
hunks are relevant to the ranges tracked in C, and computes the new
ranges for P.
The algorithm is then simply to process history in topological order
from newest to oldest, computing ranges and (partial) diffs. At
branch points, we need to merge the ranges we are watching. We will
find that many commits do not affect the chosen ranges, and mark them
TREESAME (in addition to those already filtered by pathspec limiting).
Another pass of history simplification then gets rid of such commits.
This is wired as an extra filtering pass in the log machinery. This
currently only reduces code duplication, but should allow for other
simplifications and options to be used.
Finally, we hook a diff printer into the output chain. Ideally we
would wire directly into the diff logic, to optionally use features
like word diff. However, that will require some major reworking of
the diff chain, so we completely replace the output with our own diff
for now.
As this was a GSoC project, and has quite some history by now, many
people have helped. In no particular order, thanks go to
Jakub Narebski <jnareb@gmail.com>
Jens Lehmann <Jens.Lehmann@web.de>
Jonathan Nieder <jrnieder@gmail.com>
Junio C Hamano <gitster@pobox.com>
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Will Palmer <wmpalmer@gmail.com>
Apologies to everyone I forgot.
Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-29 00:47:32 +08:00
|
|
|
include::line-range-format.txt[]
|
|
|
|
|
|
2013-04-22 13:30:28 +08:00
|
|
|
<revision range>::
|
|
|
|
|
Show only commits in the specified revision range. When no
|
|
|
|
|
<revision range> is specified, it defaults to `HEAD` (i.e. the
|
|
|
|
|
whole history leading to the current commit). `origin..HEAD`
|
|
|
|
|
specifies all the commits reachable from the current commit
|
|
|
|
|
(i.e. `HEAD`), but not from `origin`. For a complete list of
|
2013-11-13 14:21:49 +08:00
|
|
|
ways to spell <revision range>, see the 'Specifying Ranges'
|
2013-04-22 13:30:28 +08:00
|
|
|
section of linkgit:gitrevisions[7].
|
2013-04-22 13:30:27 +08:00
|
|
|
|
2008-10-01 03:57:50 +08:00
|
|
|
[\--] <path>...::
|
2011-08-30 17:21:07 +08:00
|
|
|
Show only commits that are enough to explain how the files
|
2013-11-13 14:21:49 +08:00
|
|
|
that match the specified paths came to be. See 'History
|
|
|
|
|
Simplification' below for details and other simplification
|
2011-08-30 17:21:07 +08:00
|
|
|
modes.
|
|
|
|
|
+
|
2013-11-13 14:21:49 +08:00
|
|
|
Paths may need to be prefixed with ``\-- '' to separate them from
|
2013-04-22 13:30:29 +08:00
|
|
|
options or the revision range, when confusion arises.
|
2006-04-15 03:59:09 +08:00
|
|
|
|
2011-03-08 16:31:26 +08:00
|
|
|
include::rev-list-options.txt[]
|
|
|
|
|
|
|
|
|
|
include::pretty-formats.txt[]
|
|
|
|
|
|
2013-07-16 16:05:40 +08:00
|
|
|
COMMON DIFF OPTIONS
|
2011-03-08 16:31:26 +08:00
|
|
|
-------------------
|
2010-07-08 10:14:31 +08:00
|
|
|
|
|
|
|
|
:git-log: 1
|
|
|
|
|
include::diff-options.txt[]
|
2007-05-14 07:25:45 +08:00
|
|
|
|
2007-11-01 22:57:40 +08:00
|
|
|
include::diff-generate-patch.txt[]
|
2007-05-14 07:25:45 +08:00
|
|
|
|
2013-07-16 16:05:40 +08:00
|
|
|
EXAMPLES
|
2005-10-31 12:05:32 +08:00
|
|
|
--------
|
docs: put listed example commands in backticks
Many examples of git command invocation are given in asciidoc listing
blocks, which makes them monospaced and avoids further interpretation of
special characters. Some manpages make a list of examples, like:
git foo::
Run git foo.
git foo -q::
Use the "-q" option.
to quickly show many variants. However, they can sometimes be hard to
read, because they are shown in a proportional-width font (so, for
example, seeing the difference between "-- foo" and "--foo" can be
difficult).
This patch puts all such examples into backticks, which gives the
equivalent formatting to a listing block (i.e., monospaced and without
character interpretation).
As a bonus, this also fixes an example in the git-push manpage, in which
"git push origin :::" was accidentally considered a newly-indented list,
and not a list item with "git push origin :" in it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-04 10:13:29 +08:00
|
|
|
`git log --no-merges`::
|
2005-10-31 12:05:32 +08:00
|
|
|
|
|
|
|
|
Show the whole commit history, but skip any merges
|
|
|
|
|
|
docs: put listed example commands in backticks
Many examples of git command invocation are given in asciidoc listing
blocks, which makes them monospaced and avoids further interpretation of
special characters. Some manpages make a list of examples, like:
git foo::
Run git foo.
git foo -q::
Use the "-q" option.
to quickly show many variants. However, they can sometimes be hard to
read, because they are shown in a proportional-width font (so, for
example, seeing the difference between "-- foo" and "--foo" can be
difficult).
This patch puts all such examples into backticks, which gives the
equivalent formatting to a listing block (i.e., monospaced and without
character interpretation).
As a bonus, this also fixes an example in the git-push manpage, in which
"git push origin :::" was accidentally considered a newly-indented list,
and not a list item with "git push origin :" in it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-04 10:13:29 +08:00
|
|
|
`git log v2.6.12.. include/scsi drivers/scsi`::
|
2005-10-31 12:05:32 +08:00
|
|
|
|
|
|
|
|
Show all commits since version 'v2.6.12' that changed any file
|
2013-11-13 14:21:49 +08:00
|
|
|
in the `include/scsi` or `drivers/scsi` subdirectories
|
2005-10-31 12:05:32 +08:00
|
|
|
|
docs: stop using asciidoc no-inline-literal
In asciidoc 7, backticks like `foo` produced a typographic
effect, but did not otherwise affect the syntax. In asciidoc
8, backticks introduce an "inline literal" inside which markup
is not interpreted. To keep compatibility with existing
documents, asciidoc 8 has a "no-inline-literal" attribute to
keep the old behavior. We enabled this so that the
documentation could be built on either version.
It has been several years now, and asciidoc 7 is no longer
in wide use. We can now decide whether or not we want
inline literals on their own merits, which are:
1. The source is much easier to read when the literal
contains punctuation. You can use `master~1` instead
of `master{tilde}1`.
2. They are less error-prone. Because of point (1), we
tend to make mistakes and forget the extra layer of
quoting.
This patch removes the no-inline-literal attribute from the
Makefile and converts every use of backticks in the
documentation to an inline literal (they must be cleaned up,
or the example above would literally show "{tilde}" in the
output).
Problematic sites were found by grepping for '`.*[{\\]' and
examined and fixed manually. The results were then verified
by comparing the output of "html2text" on the set of
generated html pages. Doing so revealed that in addition to
making the source more readable, this patch fixes several
formatting bugs:
- HTML rendering used the ellipsis character instead of
literal "..." in code examples (like "git log A...B")
- some code examples used the right-arrow character
instead of '->' because they failed to quote
- api-config.txt did not quote tilde, and the resulting
HTML contained a bogus snippet like:
<tt><sub></tt> foo <tt></sub>bar</tt>
which caused some parsers to choke and omit whole
sections of the page.
- git-commit.txt confused ``foo`` (backticks inside a
literal) with ``foo'' (matched double-quotes)
- mentions of `A U Thor <author@example.com>` used to
erroneously auto-generate a mailto footnote for
author@example.com
- the description of --word-diff=plain incorrectly showed
the output as "[-removed-] and {added}", not "{+added+}".
- using "prime" notation like:
commit `C` and its replacement `C'`
confused asciidoc into thinking that everything between
the first backtick and the final apostrophe were meant
to be inside matched quotes
- asciidoc got confused by the escaping of some of our
asterisks. In particular,
`credential.\*` and `credential.<url>.\*`
properly escaped the asterisk in the first case, but
literally passed through the backslash in the second
case.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-26 16:51:57 +08:00
|
|
|
`git log --since="2 weeks ago" -- gitk`::
|
2005-10-31 12:05:32 +08:00
|
|
|
|
|
|
|
|
Show the changes during the last two weeks to the file 'gitk'.
|
2013-11-13 14:21:49 +08:00
|
|
|
The ``--'' is necessary to avoid confusion with the *branch* named
|
2005-10-31 12:05:32 +08:00
|
|
|
'gitk'
|
|
|
|
|
|
docs: put listed example commands in backticks
Many examples of git command invocation are given in asciidoc listing
blocks, which makes them monospaced and avoids further interpretation of
special characters. Some manpages make a list of examples, like:
git foo::
Run git foo.
git foo -q::
Use the "-q" option.
to quickly show many variants. However, they can sometimes be hard to
read, because they are shown in a proportional-width font (so, for
example, seeing the difference between "-- foo" and "--foo" can be
difficult).
This patch puts all such examples into backticks, which gives the
equivalent formatting to a listing block (i.e., monospaced and without
character interpretation).
As a bonus, this also fixes an example in the git-push manpage, in which
"git push origin :::" was accidentally considered a newly-indented list,
and not a list item with "git push origin :" in it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-04 10:13:29 +08:00
|
|
|
`git log --name-status release..test`::
|
2006-04-15 03:59:09 +08:00
|
|
|
|
|
|
|
|
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.
|
2005-10-31 12:05:32 +08:00
|
|
|
|
2013-06-19 01:44:58 +08:00
|
|
|
`git log --follow builtin/rev-list.c`::
|
2007-07-12 22:52:30 +08:00
|
|
|
|
2013-11-13 14:21:49 +08:00
|
|
|
Shows the commits that changed `builtin/rev-list.c`, including
|
2007-07-12 22:52:30 +08:00
|
|
|
those commits that occurred before the file was given its
|
|
|
|
|
present name.
|
|
|
|
|
|
docs: put listed example commands in backticks
Many examples of git command invocation are given in asciidoc listing
blocks, which makes them monospaced and avoids further interpretation of
special characters. Some manpages make a list of examples, like:
git foo::
Run git foo.
git foo -q::
Use the "-q" option.
to quickly show many variants. However, they can sometimes be hard to
read, because they are shown in a proportional-width font (so, for
example, seeing the difference between "-- foo" and "--foo" can be
difficult).
This patch puts all such examples into backticks, which gives the
equivalent formatting to a listing block (i.e., monospaced and without
character interpretation).
As a bonus, this also fixes an example in the git-push manpage, in which
"git push origin :::" was accidentally considered a newly-indented list,
and not a list item with "git push origin :" in it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-04 10:13:29 +08:00
|
|
|
`git log --branches --not --remotes=origin`::
|
2010-01-20 17:48:25 +08:00
|
|
|
|
|
|
|
|
Shows all commits that are in any of local branches but not in
|
2010-11-02 23:31:20 +08:00
|
|
|
any of remote-tracking branches for 'origin' (what you have that
|
2010-01-20 17:48:25 +08:00
|
|
|
origin doesn't).
|
|
|
|
|
|
docs: put listed example commands in backticks
Many examples of git command invocation are given in asciidoc listing
blocks, which makes them monospaced and avoids further interpretation of
special characters. Some manpages make a list of examples, like:
git foo::
Run git foo.
git foo -q::
Use the "-q" option.
to quickly show many variants. However, they can sometimes be hard to
read, because they are shown in a proportional-width font (so, for
example, seeing the difference between "-- foo" and "--foo" can be
difficult).
This patch puts all such examples into backticks, which gives the
equivalent formatting to a listing block (i.e., monospaced and without
character interpretation).
As a bonus, this also fixes an example in the git-push manpage, in which
"git push origin :::" was accidentally considered a newly-indented list,
and not a list item with "git push origin :" in it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-04 10:13:29 +08:00
|
|
|
`git log master --not --remotes=*/master`::
|
2010-01-20 17:48:25 +08:00
|
|
|
|
|
|
|
|
Shows all commits that are in local master but not in any remote
|
|
|
|
|
repository master branches.
|
|
|
|
|
|
docs: put listed example commands in backticks
Many examples of git command invocation are given in asciidoc listing
blocks, which makes them monospaced and avoids further interpretation of
special characters. Some manpages make a list of examples, like:
git foo::
Run git foo.
git foo -q::
Use the "-q" option.
to quickly show many variants. However, they can sometimes be hard to
read, because they are shown in a proportional-width font (so, for
example, seeing the difference between "-- foo" and "--foo" can be
difficult).
This patch puts all such examples into backticks, which gives the
equivalent formatting to a listing block (i.e., monospaced and without
character interpretation).
As a bonus, this also fixes an example in the git-push manpage, in which
"git push origin :::" was accidentally considered a newly-indented list,
and not a list item with "git push origin :" in it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-04 10:13:29 +08:00
|
|
|
`git log -p -m --first-parent`::
|
2010-02-10 09:11:49 +08:00
|
|
|
|
|
|
|
|
Shows the history including change diffs, but only from the
|
2013-11-13 14:21:49 +08:00
|
|
|
``main branch'' perspective, skipping commits that come from merged
|
2010-02-10 09:11:49 +08:00
|
|
|
branches, and showing full diffs of changes introduced by the merges.
|
|
|
|
|
This makes sense only when following a strict policy of merging all
|
|
|
|
|
topic branches when staying on a single integration branch.
|
|
|
|
|
|
2013-07-16 08:10:36 +08:00
|
|
|
`git log -L '/int main/',/^}/:main.c`::
|
Implement line-history search (git log -L)
This is a rewrite of much of Bo's work, mainly in an effort to split
it into smaller, easier to understand routines.
The algorithm is built around the struct range_set, which encodes a
series of line ranges as intervals [a,b). This is used in two
contexts:
* A set of lines we are tracking (which will change as we dig through
history).
* To encode diffs, as pairs of ranges.
The main routine is range_set_map_across_diff(). It processes the
diff between a commit C and some parent P. It determines which diff
hunks are relevant to the ranges tracked in C, and computes the new
ranges for P.
The algorithm is then simply to process history in topological order
from newest to oldest, computing ranges and (partial) diffs. At
branch points, we need to merge the ranges we are watching. We will
find that many commits do not affect the chosen ranges, and mark them
TREESAME (in addition to those already filtered by pathspec limiting).
Another pass of history simplification then gets rid of such commits.
This is wired as an extra filtering pass in the log machinery. This
currently only reduces code duplication, but should allow for other
simplifications and options to be used.
Finally, we hook a diff printer into the output chain. Ideally we
would wire directly into the diff logic, to optionally use features
like word diff. However, that will require some major reworking of
the diff chain, so we completely replace the output with our own diff
for now.
As this was a GSoC project, and has quite some history by now, many
people have helped. In no particular order, thanks go to
Jakub Narebski <jnareb@gmail.com>
Jens Lehmann <Jens.Lehmann@web.de>
Jonathan Nieder <jrnieder@gmail.com>
Junio C Hamano <gitster@pobox.com>
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Will Palmer <wmpalmer@gmail.com>
Apologies to everyone I forgot.
Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-29 00:47:32 +08:00
|
|
|
|
2013-11-13 14:21:49 +08:00
|
|
|
Shows how the function `main()` in the file `main.c` evolved
|
Implement line-history search (git log -L)
This is a rewrite of much of Bo's work, mainly in an effort to split
it into smaller, easier to understand routines.
The algorithm is built around the struct range_set, which encodes a
series of line ranges as intervals [a,b). This is used in two
contexts:
* A set of lines we are tracking (which will change as we dig through
history).
* To encode diffs, as pairs of ranges.
The main routine is range_set_map_across_diff(). It processes the
diff between a commit C and some parent P. It determines which diff
hunks are relevant to the ranges tracked in C, and computes the new
ranges for P.
The algorithm is then simply to process history in topological order
from newest to oldest, computing ranges and (partial) diffs. At
branch points, we need to merge the ranges we are watching. We will
find that many commits do not affect the chosen ranges, and mark them
TREESAME (in addition to those already filtered by pathspec limiting).
Another pass of history simplification then gets rid of such commits.
This is wired as an extra filtering pass in the log machinery. This
currently only reduces code duplication, but should allow for other
simplifications and options to be used.
Finally, we hook a diff printer into the output chain. Ideally we
would wire directly into the diff logic, to optionally use features
like word diff. However, that will require some major reworking of
the diff chain, so we completely replace the output with our own diff
for now.
As this was a GSoC project, and has quite some history by now, many
people have helped. In no particular order, thanks go to
Jakub Narebski <jnareb@gmail.com>
Jens Lehmann <Jens.Lehmann@web.de>
Jonathan Nieder <jrnieder@gmail.com>
Junio C Hamano <gitster@pobox.com>
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Will Palmer <wmpalmer@gmail.com>
Apologies to everyone I forgot.
Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-29 00:47:32 +08:00
|
|
|
over time.
|
|
|
|
|
|
2012-09-06 22:28:03 +08:00
|
|
|
`git log -3`::
|
2013-11-13 14:21:49 +08:00
|
|
|
|
2012-09-06 22:28:03 +08:00
|
|
|
Limits the number of commits to show to 3.
|
2010-02-10 09:11:49 +08:00
|
|
|
|
2013-07-16 16:05:40 +08:00
|
|
|
DISCUSSION
|
2006-12-30 18:22:38 +08:00
|
|
|
----------
|
|
|
|
|
|
|
|
|
|
include::i18n.txt[]
|
|
|
|
|
|
2013-07-16 16:05:40 +08:00
|
|
|
CONFIGURATION
|
2010-05-09 11:30:41 +08:00
|
|
|
-------------
|
|
|
|
|
|
|
|
|
|
See linkgit:git-config[1] for core variables and linkgit:git-diff[1]
|
|
|
|
|
for settings related to diff generation.
|
|
|
|
|
|
|
|
|
|
format.pretty::
|
2013-11-13 14:21:49 +08:00
|
|
|
Default for the `--format` option. (See 'Pretty Formats' above.)
|
|
|
|
|
Defaults to `medium`.
|
2010-05-09 11:30:41 +08:00
|
|
|
|
|
|
|
|
i18n.logOutputEncoding::
|
2013-11-13 14:21:49 +08:00
|
|
|
Encoding to use when displaying logs. (See 'Discussion' above.)
|
|
|
|
|
Defaults to the value of `i18n.commitEncoding` if set, and UTF-8
|
2010-05-09 11:30:41 +08:00
|
|
|
otherwise.
|
|
|
|
|
|
|
|
|
|
log.date::
|
|
|
|
|
Default format for human-readable dates. (Compare the
|
|
|
|
|
`--date` option.) Defaults to "default", which means to write
|
|
|
|
|
dates like `Sat May 8 19:35:34 2010 -0500`.
|
|
|
|
|
|
2015-07-08 09:29:34 +08:00
|
|
|
log.follow::
|
2015-10-07 09:14:33 +08:00
|
|
|
If `true`, `git log` will act as if the `--follow` option was used when
|
|
|
|
|
a single <path> is given. This has the same limitations as `--follow`,
|
|
|
|
|
i.e. it cannot be used to follow multiple files and does not work well
|
|
|
|
|
on non-linear history.
|
2015-07-08 09:29:34 +08:00
|
|
|
|
2015-03-12 04:32:45 +08:00
|
|
|
log.showRoot::
|
2013-11-13 14:21:49 +08:00
|
|
|
If `false`, `git log` and related commands will not treat the
|
2010-05-09 11:30:41 +08:00
|
|
|
initial commit as a big creation event. Any root commits in
|
|
|
|
|
`git log -p` output would be shown without a diff attached.
|
|
|
|
|
The default is `true`.
|
|
|
|
|
|
2016-06-23 00:51:26 +08:00
|
|
|
log.showSignature::
|
|
|
|
|
If `true`, `git log` and related commands will act as if the
|
|
|
|
|
`--show-signature` option was passed to them.
|
|
|
|
|
|
2012-12-13 21:08:12 +08:00
|
|
|
mailmap.*::
|
2010-05-09 11:30:41 +08:00
|
|
|
See linkgit:git-shortlog[1].
|
|
|
|
|
|
|
|
|
|
notes.displayRef::
|
|
|
|
|
Which refs, in addition to the default set by `core.notesRef`
|
2016-06-08 06:35:06 +08:00
|
|
|
or `GIT_NOTES_REF`, to read notes from when showing commit
|
2013-11-13 14:21:49 +08:00
|
|
|
messages with the `log` family of commands. See
|
2010-05-09 11:30:41 +08:00
|
|
|
linkgit:git-notes[1].
|
|
|
|
|
+
|
|
|
|
|
May be an unabbreviated ref name or a glob and may be specified
|
|
|
|
|
multiple times. A warning will be issued for refs that do not exist,
|
|
|
|
|
but a glob that does not match any refs is silently ignored.
|
|
|
|
|
+
|
2011-03-30 08:57:19 +08:00
|
|
|
This setting can be disabled by the `--no-notes` option,
|
2016-06-08 06:35:06 +08:00
|
|
|
overridden by the `GIT_NOTES_DISPLAY_REF` environment variable,
|
2011-03-30 08:57:19 +08:00
|
|
|
and overridden by the `--notes=<ref>` option.
|
2006-12-30 18:22:38 +08:00
|
|
|
|
2005-08-15 08:24:36 +08:00
|
|
|
GIT
|
|
|
|
|
---
|
2008-06-06 15:07:32 +08:00
|
|
|
Part of the linkgit:git[1] suite
|
