status: use draw_text completely
[tig] / manual.txt
CommitLineData
d839253b
JF
1The tig Manual
2==============
3Jonas Fonseca <fonseca@diku.dk>
4
5This is the manual for tig, the ncurses-based text-mode interface for git.
6Tig allows you to browse changes in a git repository and can additionally act
7as a pager for output of various git commands. When used as a pager, it will
8display input from stdin and colorize it.
9
10When browsing repositories, tig uses the underlying git commands to present
11the user with various views, such as summarized commit log and showing the
12commit with the log message, diffstat, and the diff.
13
9783cb12 14ifndef::backend-docbook[]
2bc4f7bd
JF
15*Table of Contents*
16
9783cb12
JF
17include::manual.toc[]
18endif::backend-docbook[]
19
20[[calling-conventions]]
d839253b
JF
21Calling Conventions
22-------------------
23
9783cb12 24[[pager-mode]]
d839253b
JF
25Pager Mode
26~~~~~~~~~~
27
28If stdin is a pipe, any log or diff options will be ignored and the pager view
29will be opened loading data from stdin. The pager mode can be used for
30colorizing output from various git commands.
31
32Example on how to colorize the output of git-show(1):
33
511147de
JF
34-----------------------------------------------------------------------------
35$ git show | tig
36-----------------------------------------------------------------------------
d839253b 37
9783cb12 38[[cmd-options]]
d839253b
JF
39Git Command Options
40~~~~~~~~~~~~~~~~~~~
41
42All git command options specified on the command line will be passed to the
43given command and all will be shell quoted before they are passed to the
44shell.
45
46NOTE: If you specify options for the main view, you should not use the
47`--pretty` option as this option will be set automatically to the format
48expected by the main view.
49
77452abc 50Example on how to view a commit and show both author and committer
d839253b
JF
51information:
52
511147de 53-----------------------------------------------------------------------------
77452abc 54$ tig show --pretty=fuller
511147de 55-----------------------------------------------------------------------------
d839253b
JF
56
57See the <<refspec, "Specifying revisions">> section below for an introduction
58to revision options supported by the git commands. For details on specific git
59command options, refer to the man page of the command in question.
60
9783cb12 61[[env-variables]]
d839253b
JF
62Environment Variables
63---------------------
64
65Several options related to the interface with git can be configured via
66environment options.
67
b6607e7e
DV
68[[configuration-files]]
69Configuration Files
70~~~~~~~~~~~~~~~~~~~
71
72Upon startup, tig first reads the system wide configuration file
73(`{sysconfdir}/tigrc` by default) and then proceeds to read the user's
74configuration file (`~/.tigrc` by default). The paths to either of these files
75can be overridden through the following environment variables:
76
77TIGRC_USER::
78 Path of the user configuration file.
79
80TIGRC_SYSTEM::
81 Path of the system wide configuration file.
82
9783cb12 83[[repo-refs]]
d839253b
JF
84Repository References
85~~~~~~~~~~~~~~~~~~~~~
86
87Commits that are referenced by tags and branch heads will be marked by the
88reference name surrounded by '[' and ']':
89
511147de
JF
90-----------------------------------------------------------------------------
912006-03-26 19:42 Petr Baudis | [cogito-0.17.1] Cogito 0.17.1
92-----------------------------------------------------------------------------
d839253b
JF
93
94If you want to filter out certain directories under `.git/refs/`, say `tmp`
95you can do it by setting the following variable:
96
511147de
JF
97-----------------------------------------------------------------------------
98$ TIG_LS_REMOTE="git ls-remote . | sed /\/tmp\//d" tig
99-----------------------------------------------------------------------------
d839253b
JF
100
101Or set the variable permanently in your environment.
102
103TIG_LS_REMOTE::
104 Set command for retrieving all repository references. The command
105 should output data in the same format as git-ls-remote(1).
106
107[[history-commands]]
108History Commands
109~~~~~~~~~~~~~~~~
110
111It is possible to alter which commands are used for the different views. If
112for example you prefer commits in the main view to be sorted by date and only
113show 500 commits, use:
114
511147de
JF
115-----------------------------------------------------------------------------
116$ TIG_MAIN_CMD="git log --date-order -n500 --pretty=raw %s" tig
117-----------------------------------------------------------------------------
d839253b
JF
118
119Or set the variable permanently in your environment.
120
121Notice, how `%s` is used to specify the commit reference. There can be a
122maximum of 5 `%s` ref specifications.
123
124TIG_DIFF_CMD::
125 The command used for the diff view. By default, git show is used
126 as a backend.
127
128TIG_LOG_CMD::
129 The command used for the log view. If you prefer to have both
130 author and committer shown in the log view be sure to pass
131 `--pretty=fuller` to git log.
132
133TIG_MAIN_CMD::
134 The command used for the main view. Note, you must always specify
135 the option: `--pretty=raw` since the main view parser expects to
136 read that format.
137
66c86725
JF
138[[tree-commands]]
139Tree Commands
140~~~~~~~~~~~~~
141
142TIG_TREE_CMD::
143 The command used for the tree view. Takes two arguments, the first
144 is the revision ID and the second is the path of the directory tree,
145 empty for the root directory. Defaults to "git ls-tree %s %s".
146
147TIG_BLOB_CMD::
148 The command used for the blob view. Takes one argument which is
149 the blob ID. Defaults to "git cat-file blob %s".
150
9783cb12 151[[viewer]]
d839253b
JF
152The Viewer
153----------
154
155The display consists of a status window on the last line of the screen and one
156or more views. The default is to only show one view at the time but it is
157possible to split both the main and log view to also show the commit diff.
158
159If you are in the log view and press 'Enter' when the current line is a commit
160line, such as:
161
511147de
JF
162-----------------------------------------------------------------------------
163commit 4d55caff4cc89335192f3e566004b4ceef572521
164-----------------------------------------------------------------------------
d839253b
JF
165
166You will split the view so that the log view is displayed in the top window
167and the diff view in the bottom window. You can switch between the two views
168by pressing 'Tab'. To maximize the log view again, simply press 'l'.
169
9783cb12 170[[commit-id]]
d839253b
JF
171Current Head and Commit ID
172~~~~~~~~~~~~~~~~~~~~~~~~~~
173
174The viewer keeps track of both what head and commit ID you are currently
f7ffec06 175viewing. The commit ID will follow the cursor line and change every time
d839253b
JF
176you highlight a different commit. Whenever you reopen the diff view it will be
177reloaded, if the commit ID changed.
178
179The head ID is used when opening the main and log view to indicate from what
180revision to show history.
181
9783cb12 182[[views]]
d839253b
JF
183Views
184~~~~~
185
511147de 186Various 'views' of a repository is presented. Each view is based on output
d839253b
JF
187from an external command, most often 'git log', 'git diff', or 'git show'.
188
189The main view::
190 Is the default view, and it shows a one line summary of each commit
191 in the chosen list of revisions. The summary includes commit date,
192 author, and the first line of the log message. Additionally, any
193 repository references, such as tags, will be shown.
194
195The log view::
196 Presents a more rich view of the revision log showing the whole log
197 message and the diffstat.
198
199The diff view::
200 Shows either the diff of the current working tree, that is, what
201 has changed since the last commit, or the commit diff complete
202 with log message, diffstat and diff.
203
3360f449
JF
204The tree view::
205 Lists directory trees associated with the current revision allowing
206 subdirectories to be descended or ascended and file blobs to be
207 viewed.
208
209The blob view::
210 Displays the file content or "blob" of data associated with a file
211 name.
212
8a680988
JF
213The blame view::
214 Displays the file content annotated or blamed by commits.
215
173d76ea
JF
216The status view::
217 Displays status of files in the working tree and allows changes to be
218 staged/unstaged as well as adding of untracked files.
219
f9a044a4
JF
220The stage view::
221 Displays diff changes for staged or unstanged files being tracked or
222 file content of untracked files.
223
d839253b
JF
224The pager view::
225 Is used for displaying both input from stdin and output from git
226 commands entered in the internal prompt.
227
228The help view::
24b5b3e0 229 Displays key binding quick reference.
d839253b 230
9783cb12 231[[title-window]]
d839253b
JF
232Title Windows
233~~~~~~~~~~~~~
234
235Each view has a title window which shows the name of the view, current commit
236ID if available, and where the view is positioned:
237
511147de
JF
238-----------------------------------------------------------------------------
239[main] c622eefaa485995320bc743431bae0d497b1d875 - commit 1 of 61 (1%)
240-----------------------------------------------------------------------------
d839253b
JF
241
242By default, the title of the current view is highlighted using bold font. For
243long loading views (taking over 3 seconds) the time since loading started will
244be appended:
245
511147de
JF
246-----------------------------------------------------------------------------
247[main] 77d9e40fbcea3238015aea403e06f61542df9a31 - commit 1 of 779 (0%) 5s
248-----------------------------------------------------------------------------
d839253b 249
9783cb12 250[[keys]]
669b0c34
JF
251Default Keybindings
252-------------------
d839253b
JF
253Below the default key bindings are shown.
254
9783cb12 255[[view-switching]]
d839253b
JF
256View Switching
257~~~~~~~~~~~~~~
669b0c34
JF
258
259`-------`--------------------------------------------------------------------
260Key Action
261-----------------------------------------------------------------------------
262m Switch to main view.
263d Switch to diff view.
264l Switch to log view.
265p Switch to pager view.
3360f449 266t Switch to (directory) tree view.
0001fc34 267f Switch to (file) blob view.
8a680988 268B Switch to blame view.
173d76ea
JF
269h Switch to help view
270S Switch to status view
f9a044a4 271c Switch to stage view
669b0c34 272-----------------------------------------------------------------------------
d839253b 273
9783cb12 274[[view-manipulation]]
d839253b
JF
275View Manipulation
276~~~~~~~~~~~~~~~~~
669b0c34
JF
277
278`-------`--------------------------------------------------------------------
279Key Action
280-----------------------------------------------------------------------------
281q Close view, if multiple views are open it will jump back to the \
282 previous view in the view stack. If it is the last open view it \
d839253b 283 will quit. Use 'Q' to quit all views at once.
669b0c34
JF
284Enter This key is "context sensitive" depending on what view you are \
285 currently in. When in log view on a commit line or in the main \
286 view, split the view and show the commit diff. In the diff view \
d839253b 287 pressing Enter will simply scroll the view one line down.
669b0c34 288Tab Switch to next view.
272818ea 289R Reload and refresh the current view.
47dd652b 290M Maximize the current view to fill the whole display.
669b0c34 291Up This key is "context sensitive" and will move the cursor one \
f7ffec06 292 line up. However, if you opened a diff view from the main view \
669b0c34
JF
293 (split- or full-screen) it will change the cursor to point to \
294 the previous commit in the main view and update the diff view \
d839253b 295 to display it.
669b0c34
JF
296Down Similar to 'Up' but will move down.
297-----------------------------------------------------------------------------
d839253b 298
9783cb12 299[[cursor-nav]]
d839253b
JF
300Cursor Navigation
301~~~~~~~~~~~~~~~~~
669b0c34
JF
302
303`-------`--------------------------------------------------------------------
304Key Action
305-----------------------------------------------------------------------------
306j Move cursor one line up.
307k Move cursor one line down.
03e8d891
JF
308PgUp,\
309-,a Move cursor one page up.
669b0c34
JF
310PgDown Space Move cursor one page down.
311Home Jump to first line.
312End Jump to last line.
313-----------------------------------------------------------------------------
d839253b 314
9783cb12 315[[view-scrolling]]
d839253b
JF
316Scrolling
317~~~~~~~~~
669b0c34
JF
318
319`-------`--------------------------------------------------------------------
320Key Action
321-----------------------------------------------------------------------------
322Insert Scroll view one line up.
323Delete Scroll view one line down.
324w Scroll view one page up.
325s Scroll view one page down.
326-----------------------------------------------------------------------------
d839253b 327
4af34daa
JF
328[[searching]]
329Searching
330~~~~~~~~~
331
332`-------`--------------------------------------------------------------------
333Key Action
334-----------------------------------------------------------------------------
335/ Search the view. Opens a prompt for entering search regex to use.
336? Search backwards in the view. Also prompts for regex.
337n Find next match for the current search regex.
338N Find previous match for the current search regex.
339-----------------------------------------------------------------------------
340
9783cb12 341[[misc-keys]]
d839253b
JF
342Misc
343~~~~
669b0c34
JF
344
345`-------`--------------------------------------------------------------------
346Key Action
347-----------------------------------------------------------------------------
348Q Quit.
349r Redraw screen.
350z Stop all background loading. This can be useful if you use \
351 tig in a repository with a long history without limiting \
d839253b 352 the revision log.
669b0c34 353v Show version.
904e68d8 354'.' Toggle line numbers on/off.
823057f4
DV
355D Toggle date display on/off.
356A Toggle author display on/off.
669b0c34 357g Toggle revision graph visualization on/off.
823057f4 358F Toggle reference display on/off (tag and branch names).
669b0c34
JF
359':' Open prompt. This allows you to specify what git command \
360 to run. Example `:log -p`
f9a044a4
JF
361u Update status of file. In the status view, this allows you to add an \
362 untracked file or stage changes to a file for next commit (similar to \
363 running git-add <filename>). In the stage view, when pressing this on \
364 a diff chunk line stages only that chunk for next commit, when not on \
365 a diff chunk line all changes in the displayed diff is staged.
b5c18d9d
JF
366M Resolve unmerged file by launching git-mergetool(1). Note, to work \
367 correctly this might require some initial configuration of your \
368 preferred merge tool. See the manpage of git-mergetool(1).
c509eed2
DV
369',' Move tree view to the parent tree.
370e Open file in editor.
669b0c34 371-----------------------------------------------------------------------------
d839253b 372
f655964f
JF
373[[external-commands]]
374External Commands
375~~~~~~~~~~~~~~~~~
376
377Tig also comes with a few builtin external commands. These are simple shell
378commands that are run and can take arguments from the current browsing state,
379such as the current commit ID. The default commands are:
380
381`-------`--------------------------------------------------------------------
382Key Action
383-----------------------------------------------------------------------------
384C git cherry-pick %(commit)
385G git gc
386-----------------------------------------------------------------------------
387
d839253b
JF
388[[refspec]]
389Revision Specification
390----------------------
391
392This section describes various ways to specify what revisions to display or
511147de 393otherwise limit the view to. Tig does not itself parse the described
f7ffec06 394revision options so refer to the relevant git man pages for further
d839253b
JF
395information. Relevant man pages besides git-log(1) are git-diff(1) and
396git-rev-list(1).
397
398You can tune the interaction with git by making use of the options explained
399in this section. For example, by configuring the environment variables
400described in the <<history-commands, "History commands">> section.
401
9783cb12 402[[path-limiting]]
d839253b
JF
403Limit by Path Name
404~~~~~~~~~~~~~~~~~~
405
406If you are interested only in those revisions that made changes to a specific
407file (or even several files) list the files like this:
408
511147de 409-----------------------------------------------------------------------------
77452abc 410$ tig Makefile README
511147de 411-----------------------------------------------------------------------------
d839253b 412
77452abc
JF
413To avoid ambiguity with tig's subcommands or repository references such as tag
414name, be sure to separate file names from other git options using "\--". So if
415you have a file named 'status' it will clash with the 'status' subcommand, and
416thus you will have to use:
d839253b 417
511147de 418-----------------------------------------------------------------------------
77452abc 419$ tig -- status
511147de 420-----------------------------------------------------------------------------
d839253b
JF
421
422NOTE: For the main view, avoiding ambiguity will in some cases require you to
511147de 423specify two "\--" options. The first will make tig stop option processing
d839253b
JF
424and the latter will be passed to git log.
425
9783cb12 426[[date-number-limiting]]
d839253b
JF
427Limit by Date or Number
428~~~~~~~~~~~~~~~~~~~~~~~
429
430To speed up interaction with git, you can limit the amount of commits to show
431both for the log and main view. Either limit by date using e.g.
432`--since=1.month` or limit by the number of commits using `-n400`.
433
434If you are only interested in changed that happened between two dates you can
435use:
436
511147de 437-----------------------------------------------------------------------------
77452abc 438$ tig --after="May 5th" --before="2006-05-16 15:44"
511147de 439-----------------------------------------------------------------------------
d839253b
JF
440
441NOTE: If you want to avoid having to quote dates containing spaces you can use
442"." instead, e.g. `--after=May.5th`.
443
9783cb12 444[[commit-range-limiting]]
d839253b
JF
445Limiting by Commit Ranges
446~~~~~~~~~~~~~~~~~~~~~~~~~
447
448Alternatively, commits can be limited to a specific range, such as "all
449commits between 'tag-1.0' and 'tag-2.0'". For example:
450
511147de 451-----------------------------------------------------------------------------
77452abc 452$ tig tag-1.0..tag-2.0
511147de 453-----------------------------------------------------------------------------
d839253b
JF
454
455This way of commit limiting makes it trivial to only browse the commits which
456haven't been pushed to a remote branch. Assuming 'origin' is your upstream
457remote branch, using:
458
511147de 459-----------------------------------------------------------------------------
77452abc 460$ tig origin..HEAD
511147de 461-----------------------------------------------------------------------------
d839253b
JF
462
463will list what will be pushed to the remote branch. Optionally, the ending
464'HEAD' can be left out since it is implied.
465
9783cb12 466[[reachability-limiting]]
d839253b
JF
467Limiting by Reachability
468~~~~~~~~~~~~~~~~~~~~~~~~
469
470Git interprets the range specifier "tag-1.0..tag-2.0" as "all commits
471reachable from 'tag-2.0' but not from 'tag-1.0'". Where reachability refers
472to what commits are ancestors (or part of the history) of the branch or tagged
473revision in question.
474
475If you prefer to specify which commit to preview in this way use the
476following:
477
511147de 478-----------------------------------------------------------------------------
77452abc 479$ tig tag-2.0 ^tag-1.0
511147de 480-----------------------------------------------------------------------------
d839253b
JF
481
482You can think of '^' as a negation operator. Using this alternate syntax, it
483is possible to further prune commits by specifying multiple branch cut offs.
484
9783cb12 485[[refspec-combi]]
d839253b
JF
486Combining Revisions Specification
487~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
488
489Revisions options can to some degree be combined, which makes it possible to
490say "show at most 20 commits from within the last month that changed files
491under the Documentation/ directory."
492
511147de 493-----------------------------------------------------------------------------
77452abc 494$ tig --since=1.month -n20 -- Documentation/
511147de 495-----------------------------------------------------------------------------
d839253b 496
9783cb12 497[[refspec-all]]
d839253b
JF
498Examining All Repository References
499~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
500
501In some cases, it can be useful to query changes across all references in a
502repository. An example is to ask "did any line of development in this
503repository change a particular file within the last week". This can be
504accomplished using:
505
511147de 506-----------------------------------------------------------------------------
77452abc 507$ tig --all --since=1.week -- Makefile
511147de 508-----------------------------------------------------------------------------
d839253b
JF
509
510include::BUGS[]
511
9783cb12 512[[copy-right]]
d839253b
JF
513Copyright
514---------
515
f9a044a4 516Copyright (c) 2006-2007 Jonas Fonseca <fonseca@diku.dk>
d839253b
JF
517
518This program is free software; you can redistribute it and/or modify
519it under the terms of the GNU General Public License as published by
520the Free Software Foundation; either version 2 of the License, or
521(at your option) any later version.
522
9783cb12 523[[references]]
d839253b
JF
524References and Related Tools
525----------------------------
526
511147de
JF
527Manpages:
528
529 - gitlink:tig[1]
530 - gitlink:tigrc[5]
531
532Online resources:
533
d839253b
JF
534include::SITES[]
535
d839253b
JF
536Other git repository browsers:
537
538 - gitk(1)
539 - qgit(1)
540 - gitview(1)