Documentation / gitk.txton commit rebase: Support preserving merges in non-interactive mode (f8cca01)
   1gitk(1)
   2=======
   3
   4NAME
   5----
   6gitk - The git repository browser
   7
   8SYNOPSIS
   9--------
  10'gitk' [<option>...] [<revs>] [--] [<path>...]
  11
  12DESCRIPTION
  13-----------
  14Displays changes in a repository or a selected set of commits. This includes
  15visualizing the commit graph, showing information related to each commit, and
  16the files in the trees of each revision.
  17
  18Historically, gitk was the first repository browser. It's written in tcl/tk
  19and started off in a separate repository but was later merged into the main
  20git repository.
  21
  22OPTIONS
  23-------
  24To control which revisions to shown, the command takes options applicable to
  25the 'git-rev-list' command (see linkgit:git-rev-list[1]).
  26This manual page describes only the most
  27frequently used options.
  28
  29-n <number>::
  30--max-count=<number>::
  31
  32        Limits the number of commits to show.
  33
  34--since=<date>::
  35
  36        Show commits more recent than a specific date.
  37
  38--until=<date>::
  39
  40        Show commits older than a specific date.
  41
  42--all::
  43
  44        Show all branches.
  45
  46--merge::
  47
  48        After an attempt to merge stops with conflicts, show the commits on
  49        the history between two branches (i.e. the HEAD and the MERGE_HEAD)
  50        that modify the conflicted files.
  51
  52--argscmd=<command>::
  53        Command to be run each time gitk has to determine the list of
  54        <revs> to show.  The command is expected to print on its standard
  55        output a list of additional revs to be shown, one per line.
  56        Use this instead of explicitly specifying <revs> if the set of
  57        commits to show may vary between refreshes.
  58
  59<revs>::
  60
  61        Limit the revisions to show. This can be either a single revision
  62        meaning show from the given revision and back, or it can be a range in
  63        the form "'<from>'..'<to>'" to show all revisions between '<from>' and
  64        back to '<to>'. Note, more advanced revision selection can be applied.
  65        For a more complete list of ways to spell object names, see
  66        "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
  67
  68<path>...::
  69
  70        Limit commits to the ones touching files in the given paths. Note, to
  71        avoid ambiguity wrt. revision names use "--" to separate the paths
  72        from any preceding options.
  73
  74Examples
  75--------
  76gitk v2.6.12.. include/scsi drivers/scsi::
  77
  78        Show as the changes since version 'v2.6.12' that changed any
  79        file in the include/scsi or drivers/scsi subdirectories
  80
  81gitk --since="2 weeks ago" \-- gitk::
  82
  83        Show the changes during the last two weeks to the file 'gitk'.
  84        The "--" is necessary to avoid confusion with the *branch* named
  85        'gitk'
  86
  87gitk --max-count=100 --all \-- Makefile::
  88
  89        Show at most 100 changes made to the file 'Makefile'. Instead of only
  90        looking for changes in the current branch look in all branches.
  91
  92Files
  93-----
  94Gitk creates the .gitk file in your $HOME directory to store preferences
  95such as display options, font, and colors.
  96
  97SEE ALSO
  98--------
  99'qgit(1)'::
 100        A repository browser written in C++ using Qt.
 101
 102'gitview(1)'::
 103        A repository browser written in Python using Gtk. It's based on
 104        'bzrk(1)' and distributed in the contrib area of the git repository.
 105
 106'tig(1)'::
 107        A minimal repository browser and git tool output highlighter written
 108        in C using Ncurses.
 109
 110Author
 111------
 112Written by Paul Mackerras <paulus@samba.org>.
 113
 114Documentation
 115--------------
 116Documentation by Junio C Hamano, Jonas Fonseca, and the git-list
 117<git@vger.kernel.org>.
 118
 119GIT
 120---
 121Part of the linkgit:git[1] suite