Remove uncontested renamed files during merge.
[git/debian.git] / Documentation / git-log.txt
blob79643ac928b05b4a97a09a5adfb67b1b4a2b832c
1 git-log(1)
2 ==========
4 NAME
5 ----
6 git-log - Show commit logs
9 SYNOPSIS
10 --------
11 'git-log' <option>...
13 DESCRIPTION
14 -----------
15 Shows the commit logs.
17 The command takes options applicable to the gitlink:git-rev-list[1]
18 command to control what is shown and how, and options applicable to
19 the gitlink:git-diff-tree[1] commands to control how the change
20 each commit introduces are shown.
22 This manual page describes only the most frequently used options.
25 OPTIONS
26 -------
28 include::pretty-formats.txt[]
30 --max-count=<n>::
31         Limits the number of commits to show.
33 <since>..<until>::
34         Show only commits between the named two commits.
36 -p::
37         Show the change the commit introduces in a patch form.
39 <paths>...::
40         Show only commits that affect the specified paths.
43 Examples
44 --------
45 git log --no-merges::
47         Show the whole commit history, but skip any merges
49 git log v2.6.12.. include/scsi drivers/scsi::
51         Show all commits since version 'v2.6.12' that changed any file
52         in the include/scsi or drivers/scsi subdirectories
54 git log --since="2 weeks ago" \-- gitk::
56         Show the changes during the last two weeks to the file 'gitk'.
57         The "--" is necessary to avoid confusion with the *branch* named
58         'gitk'
60 git log -r --name-status release..test::
62         Show the commits that are in the "test" branch but not yet
63         in the "release" branch, along with the list of paths
64         each commit modifies.
66 Author
67 ------
68 Written by Linus Torvalds <torvalds@osdl.org>
70 Documentation
71 --------------
72 Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
74 GIT
75 ---
76 Part of the gitlink:git[7] suite