2005-08-23 10:49:47 +02:00
|
|
|
gitk(1)
|
|
|
|
=======
|
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
2013-01-21 20:17:53 +01:00
|
|
|
gitk - The Git repository browser
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
2011-07-02 04:38:26 +02:00
|
|
|
[verse]
|
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13). In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.
Restructure and expand the manpage. List more options that the author
perceives as useful, while remaining somewhat terse. Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.
Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-20 18:57:41 +02:00
|
|
|
'gitk' [<options>] [<revision range>] [\--] [<path>...]
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
2006-08-25 03:04:58 +02:00
|
|
|
Displays changes in a repository or a selected set of commits. This includes
|
|
|
|
visualizing the commit graph, showing information related to each commit, and
|
|
|
|
the files in the trees of each revision.
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
OPTIONS
|
|
|
|
-------
|
2006-08-25 03:04:58 +02:00
|
|
|
|
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13). In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.
Restructure and expand the manpage. List more options that the author
perceives as useful, while remaining somewhat terse. Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.
Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-20 18:57:41 +02:00
|
|
|
To control which revisions to show, gitk supports most options
|
|
|
|
applicable to the 'git rev-list' command. It also supports a few
|
|
|
|
options applicable to the 'git diff-*' commands to control how the
|
|
|
|
changes each commit introduces are shown. Finally, it supports some
|
|
|
|
gitk-specific options.
|
|
|
|
|
|
|
|
gitk generally only understands options with arguments in the
|
|
|
|
'sticked' form (see linkgit:gitcli[7]) due to limitations in the
|
2014-05-21 20:52:26 +02:00
|
|
|
command-line parser.
|
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13). In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.
Restructure and expand the manpage. List more options that the author
perceives as useful, while remaining somewhat terse. Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.
Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-20 18:57:41 +02:00
|
|
|
|
|
|
|
rev-list options and arguments
|
|
|
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
|
|
|
|
This manual page describes only the most frequently used options. See
|
|
|
|
linkgit:git-rev-list[1] for a complete list.
|
|
|
|
|
|
|
|
--all::
|
|
|
|
|
|
|
|
Show all refs (branches, tags, etc.).
|
2006-08-25 03:04:58 +02:00
|
|
|
|
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13). In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.
Restructure and expand the manpage. List more options that the author
perceives as useful, while remaining somewhat terse. Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.
Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-20 18:57:41 +02:00
|
|
|
--branches[=<pattern>]::
|
|
|
|
--tags[=<pattern>]::
|
|
|
|
--remotes[=<pattern>]::
|
|
|
|
|
|
|
|
Pretend as if all the branches (tags, remote branches, resp.)
|
|
|
|
are listed on the command line as '<commit>'. If '<pattern>'
|
|
|
|
is given, limit refs to ones matching given shell glob. If
|
|
|
|
pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the
|
|
|
|
end is implied.
|
2006-08-25 03:04:58 +02:00
|
|
|
|
|
|
|
--since=<date>::
|
|
|
|
|
|
|
|
Show commits more recent than a specific date.
|
|
|
|
|
|
|
|
--until=<date>::
|
|
|
|
|
|
|
|
Show commits older than a specific date.
|
2005-08-23 10:49:47 +02:00
|
|
|
|
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13). In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.
Restructure and expand the manpage. List more options that the author
perceives as useful, while remaining somewhat terse. Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.
Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-20 18:57:41 +02:00
|
|
|
--date-order::
|
2006-09-20 12:23:41 +02:00
|
|
|
|
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13). In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.
Restructure and expand the manpage. List more options that the author
perceives as useful, while remaining somewhat terse. Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.
Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-20 18:57:41 +02:00
|
|
|
Sort commits by date when possible.
|
2006-09-20 12:23:41 +02:00
|
|
|
|
2008-04-28 22:58:35 +02:00
|
|
|
--merge::
|
|
|
|
|
|
|
|
After an attempt to merge stops with conflicts, show the commits on
|
|
|
|
the history between two branches (i.e. the HEAD and the MERGE_HEAD)
|
2009-02-06 05:40:53 +01:00
|
|
|
that modify the conflicted files and do not exist on all the heads
|
|
|
|
being merged.
|
2008-04-28 22:58:35 +02:00
|
|
|
|
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13). In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.
Restructure and expand the manpage. List more options that the author
perceives as useful, while remaining somewhat terse. Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.
Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-20 18:57:41 +02:00
|
|
|
--left-right::
|
2008-08-29 00:00:28 +02:00
|
|
|
|
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13). In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.
Restructure and expand the manpage. List more options that the author
perceives as useful, while remaining somewhat terse. Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.
Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-20 18:57:41 +02:00
|
|
|
Mark which side of a symmetric diff a commit is reachable
|
|
|
|
from. Commits from the left side are prefixed with a `<`
|
|
|
|
symbol and those from the right with a `>` symbol.
|
2008-11-13 18:28:49 +01:00
|
|
|
|
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13). In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.
Restructure and expand the manpage. List more options that the author
perceives as useful, while remaining somewhat terse. Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.
Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-20 18:57:41 +02:00
|
|
|
--full-history::
|
|
|
|
|
|
|
|
When filtering history with '<path>...', does not prune some
|
|
|
|
history. (See "History simplification" in linkgit:git-log[1]
|
|
|
|
for a more detailed explanation.)
|
|
|
|
|
|
|
|
--simplify-merges::
|
2008-11-13 18:28:49 +01:00
|
|
|
|
2016-06-28 13:40:11 +02:00
|
|
|
Additional option to `--full-history` to remove some needless
|
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13). In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.
Restructure and expand the manpage. List more options that the author
perceives as useful, while remaining somewhat terse. Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.
Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-20 18:57:41 +02:00
|
|
|
merges from the resulting history, as there are no selected
|
|
|
|
commits contributing to this merge. (See "History
|
|
|
|
simplification" in linkgit:git-log[1] for a more detailed
|
|
|
|
explanation.)
|
|
|
|
|
|
|
|
--ancestry-path::
|
|
|
|
|
|
|
|
When given a range of commits to display
|
|
|
|
(e.g. 'commit1..commit2' or 'commit2 {caret}commit1'), only
|
|
|
|
display commits that exist directly on the ancestry chain
|
|
|
|
between the 'commit1' and 'commit2', i.e. commits that are
|
|
|
|
both descendants of 'commit1', and ancestors of 'commit2'.
|
|
|
|
(See "History simplification" in linkgit:git-log[1] for a more
|
|
|
|
detailed explanation.)
|
|
|
|
|
2013-11-16 18:37:57 +01:00
|
|
|
-L<start>,<end>:<file>::
|
2015-04-20 14:09:06 +02:00
|
|
|
-L:<funcname>:<file>::
|
2013-11-16 18:37:57 +01:00
|
|
|
|
|
|
|
Trace the evolution of the line range given by "<start>,<end>"
|
2015-04-20 14:09:06 +02:00
|
|
|
(or the function name regex <funcname>) within the <file>. You may
|
2013-11-16 18:37:57 +01: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.
|
|
|
|
You can specify this option more than once.
|
|
|
|
+
|
|
|
|
*Note:* gitk (unlike linkgit:git-log[1]) currently only understands
|
|
|
|
this option if you specify it "glued together" with its argument. Do
|
|
|
|
*not* put a space after `-L`.
|
|
|
|
+
|
|
|
|
include::line-range-format.txt[]
|
|
|
|
|
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13). In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.
Restructure and expand the manpage. List more options that the author
perceives as useful, while remaining somewhat terse. Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.
Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-20 18:57:41 +02:00
|
|
|
<revision range>::
|
2005-08-23 10:49:47 +02:00
|
|
|
|
2006-08-25 03:04:58 +02:00
|
|
|
Limit the revisions to show. This can be either a single revision
|
|
|
|
meaning show from the given revision and back, or it can be a range in
|
|
|
|
the form "'<from>'..'<to>'" to show all revisions between '<from>' and
|
|
|
|
back to '<to>'. Note, more advanced revision selection can be applied.
|
2007-01-18 03:08:09 +01:00
|
|
|
For a more complete list of ways to spell object names, see
|
2010-10-11 18:03:32 +02:00
|
|
|
linkgit:gitrevisions[7].
|
2006-08-25 03:04:58 +02:00
|
|
|
|
2008-07-30 11:33:43 +02:00
|
|
|
<path>...::
|
2006-08-25 03:04:58 +02:00
|
|
|
|
|
|
|
Limit commits to the ones touching files in the given paths. Note, to
|
2009-03-03 20:29:21 +01:00
|
|
|
avoid ambiguity with respect to revision names use "--" to separate the paths
|
2007-02-04 05:49:16 +01:00
|
|
|
from any preceding options.
|
2005-08-23 10:49:47 +02:00
|
|
|
|
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13). In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.
Restructure and expand the manpage. List more options that the author
perceives as useful, while remaining somewhat terse. Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.
Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-20 18:57:41 +02:00
|
|
|
gitk-specific options
|
|
|
|
~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
|
|
|
|
--argscmd=<command>::
|
|
|
|
|
|
|
|
Command to be run each time gitk has to determine the revision
|
|
|
|
range to show. The command is expected to print on its
|
|
|
|
standard output a list of additional revisions to be shown,
|
|
|
|
one per line. Use this instead of explicitly specifying a
|
|
|
|
'<revision range>' if the set of commits to show may vary
|
|
|
|
between refreshes.
|
|
|
|
|
|
|
|
--select-commit=<ref>::
|
|
|
|
|
|
|
|
Select the specified commit after loading the graph.
|
|
|
|
Default behavior is equivalent to specifying '--select-commit=HEAD'.
|
|
|
|
|
2005-10-31 05:05:32 +01:00
|
|
|
Examples
|
|
|
|
--------
|
|
|
|
gitk v2.6.12.. include/scsi drivers/scsi::
|
|
|
|
|
2008-12-19 13:14:18 +01:00
|
|
|
Show the changes since version 'v2.6.12' that changed any
|
2005-10-31 05:05:32 +01:00
|
|
|
file in the include/scsi or drivers/scsi subdirectories
|
|
|
|
|
2006-05-05 21:05:24 +02:00
|
|
|
gitk --since="2 weeks ago" \-- gitk::
|
2005-10-31 05:05:32 +01:00
|
|
|
|
|
|
|
Show the changes during the last two weeks to the file 'gitk'.
|
|
|
|
The "--" is necessary to avoid confusion with the *branch* named
|
|
|
|
'gitk'
|
|
|
|
|
2007-10-19 19:24:43 +02:00
|
|
|
gitk --max-count=100 --all \-- Makefile::
|
2006-09-20 12:23:41 +02:00
|
|
|
|
|
|
|
Show at most 100 changes made to the file 'Makefile'. Instead of only
|
|
|
|
looking for changes in the current branch look in all branches.
|
|
|
|
|
2008-04-12 11:50:20 +02:00
|
|
|
Files
|
|
|
|
-----
|
2014-03-20 14:33:49 +01:00
|
|
|
User configuration and preferences are stored at:
|
|
|
|
|
|
|
|
* '$XDG_CONFIG_HOME/git/gitk' if it exists, otherwise
|
|
|
|
* '$HOME/.gitk' if it exists
|
|
|
|
|
|
|
|
If neither of the above exist then '$XDG_CONFIG_HOME/git/gitk' is created and
|
|
|
|
used by default. If '$XDG_CONFIG_HOME' is not set it defaults to
|
|
|
|
'$HOME/.config' in all cases.
|
2008-04-12 11:50:20 +02:00
|
|
|
|
Documentation: revamp gitk(1)
The gitk manpage suffers from a bit of neglect: there have been only
minor changes, and no changes to the set of options documented, since
a2df1fb (Documentation: New GUI configuration and command-line
options., 2008-11-13). In the meantime, the set of rev-list options
has been expanded several times by options that are useful in gitk,
e.g., --ancestry-path and the optional globbing for --branches, --tags
and --remotes.
Restructure and expand the manpage. List more options that the author
perceives as useful, while remaining somewhat terse. Ideally the user
should not have to look up any of the references, but we dispense with
precise explanations in some places and refer to git-log(1) instead.
Note that the options that have an easy GUI equivalent (e.g.,
--word-diff, -S, --grep) are deliberately not listed even in the cases
where they simply fill in the GUI fields.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-20 18:57:41 +02:00
|
|
|
History
|
|
|
|
-------
|
|
|
|
Gitk was the first graphical repository browser. It's written in
|
|
|
|
tcl/tk and started off in a separate repository but was later merged
|
|
|
|
into the main Git repository.
|
|
|
|
|
|
|
|
|
2008-05-29 01:55:27 +02:00
|
|
|
SEE ALSO
|
2006-08-25 03:04:58 +02:00
|
|
|
--------
|
|
|
|
'qgit(1)'::
|
|
|
|
A repository browser written in C++ using Qt.
|
|
|
|
|
|
|
|
'gitview(1)'::
|
|
|
|
A repository browser written in Python using Gtk. It's based on
|
2013-01-21 20:17:53 +01:00
|
|
|
'bzrk(1)' and distributed in the contrib area of the Git repository.
|
2006-08-25 03:04:58 +02:00
|
|
|
|
|
|
|
'tig(1)'::
|
2013-01-21 20:17:53 +01:00
|
|
|
A minimal repository browser and Git tool output highlighter written
|
2006-08-25 03:04:58 +02:00
|
|
|
in C using Ncurses.
|
|
|
|
|
2005-08-23 10:49:47 +02:00
|
|
|
GIT
|
|
|
|
---
|
2008-06-06 09:07:32 +02:00
|
|
|
Part of the linkgit:git[1] suite
|