Add blame view
[tig] / manual.txt
... / ...
CommitLineData
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
14ifndef::backend-docbook[]
15*Table of Contents*
16
17include::manual.toc[]
18endif::backend-docbook[]
19
20[[calling-conventions]]
21Calling Conventions
22-------------------
23
24[[pager-mode]]
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
34-----------------------------------------------------------------------------
35$ git show | tig
36-----------------------------------------------------------------------------
37
38[[cmd-options]]
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
50Example on how to view a commit and show both author and committer
51information:
52
53-----------------------------------------------------------------------------
54$ tig show --pretty=fuller
55-----------------------------------------------------------------------------
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
61[[env-variables]]
62Environment Variables
63---------------------
64
65Several options related to the interface with git can be configured via
66environment options.
67
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
83[[repo-refs]]
84Repository References
85~~~~~~~~~~~~~~~~~~~~~
86
87Commits that are referenced by tags and branch heads will be marked by the
88reference name surrounded by '[' and ']':
89
90-----------------------------------------------------------------------------
912006-03-26 19:42 Petr Baudis | [cogito-0.17.1] Cogito 0.17.1
92-----------------------------------------------------------------------------
93
94If you want to filter out certain directories under `.git/refs/`, say `tmp`
95you can do it by setting the following variable:
96
97-----------------------------------------------------------------------------
98$ TIG_LS_REMOTE="git ls-remote . | sed /\/tmp\//d" tig
99-----------------------------------------------------------------------------
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
115-----------------------------------------------------------------------------
116$ TIG_MAIN_CMD="git log --date-order -n500 --pretty=raw %s" tig
117-----------------------------------------------------------------------------
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
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
151[[viewer]]
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
162-----------------------------------------------------------------------------
163commit 4d55caff4cc89335192f3e566004b4ceef572521
164-----------------------------------------------------------------------------
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
170[[commit-id]]
171Current Head and Commit ID
172~~~~~~~~~~~~~~~~~~~~~~~~~~
173
174The viewer keeps track of both what head and commit ID you are currently
175viewing. The commit ID will follow the cursor line and change every time
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
182[[views]]
183Views
184~~~~~
185
186Various 'views' of a repository is presented. Each view is based on output
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
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
213The blame view::
214 Displays the file content annotated or blamed by commits.
215
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
220The stage view::
221 Displays diff changes for staged or unstanged files being tracked or
222 file content of untracked files.
223
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::
229 Displays key binding quick reference.
230
231[[title-window]]
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
238-----------------------------------------------------------------------------
239[main] c622eefaa485995320bc743431bae0d497b1d875 - commit 1 of 61 (1%)
240-----------------------------------------------------------------------------
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
246-----------------------------------------------------------------------------
247[main] 77d9e40fbcea3238015aea403e06f61542df9a31 - commit 1 of 779 (0%) 5s
248-----------------------------------------------------------------------------
249
250[[keys]]
251Default Keybindings
252-------------------
253Below the default key bindings are shown.
254
255[[view-switching]]
256View Switching
257~~~~~~~~~~~~~~
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.
266t Switch to (directory) tree view.
267f Switch to (file) blob view.
268B Switch to blame view.
269h Switch to help view
270S Switch to status view
271c Switch to stage view
272-----------------------------------------------------------------------------
273
274[[view-manipulation]]
275View Manipulation
276~~~~~~~~~~~~~~~~~
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 \
283 will quit. Use 'Q' to quit all views at once.
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 \
287 pressing Enter will simply scroll the view one line down.
288Tab Switch to next view.
289R Reload and refresh the current view.
290Up This key is "context sensitive" and will move the cursor one \
291 line up. However, if you opened a diff view from the main view \
292 (split- or full-screen) it will change the cursor to point to \
293 the previous commit in the main view and update the diff view \
294 to display it.
295Down Similar to 'Up' but will move down.
296-----------------------------------------------------------------------------
297
298[[cursor-nav]]
299Cursor Navigation
300~~~~~~~~~~~~~~~~~
301
302`-------`--------------------------------------------------------------------
303Key Action
304-----------------------------------------------------------------------------
305j Move cursor one line up.
306k Move cursor one line down.
307PgUp,\
308-,a Move cursor one page up.
309PgDown Space Move cursor one page down.
310Home Jump to first line.
311End Jump to last line.
312-----------------------------------------------------------------------------
313
314[[view-scrolling]]
315Scrolling
316~~~~~~~~~
317
318`-------`--------------------------------------------------------------------
319Key Action
320-----------------------------------------------------------------------------
321Insert Scroll view one line up.
322Delete Scroll view one line down.
323w Scroll view one page up.
324s Scroll view one page down.
325-----------------------------------------------------------------------------
326
327[[searching]]
328Searching
329~~~~~~~~~
330
331`-------`--------------------------------------------------------------------
332Key Action
333-----------------------------------------------------------------------------
334/ Search the view. Opens a prompt for entering search regex to use.
335? Search backwards in the view. Also prompts for regex.
336n Find next match for the current search regex.
337N Find previous match for the current search regex.
338-----------------------------------------------------------------------------
339
340[[misc-keys]]
341Misc
342~~~~
343
344`-------`--------------------------------------------------------------------
345Key Action
346-----------------------------------------------------------------------------
347Q Quit.
348r Redraw screen.
349z Stop all background loading. This can be useful if you use \
350 tig in a repository with a long history without limiting \
351 the revision log.
352v Show version.
353'.' Toggle line numbers on/off.
354D Toggle date display on/off.
355A Toggle author display on/off.
356g Toggle revision graph visualization on/off.
357F Toggle reference display on/off (tag and branch names).
358':' Open prompt. This allows you to specify what git command \
359 to run. Example `:log -p`
360u Update status of file. In the status view, this allows you to add an \
361 untracked file or stage changes to a file for next commit (similar to \
362 running git-add <filename>). In the stage view, when pressing this on \
363 a diff chunk line stages only that chunk for next commit, when not on \
364 a diff chunk line all changes in the displayed diff is staged.
365M Resolve unmerged file by launching git-mergetool(1). Note, to work \
366 correctly this might require some initial configuration of your \
367 preferred merge tool. See the manpage of git-mergetool(1).
368',' Move tree view to the parent tree.
369e Open file in editor.
370-----------------------------------------------------------------------------
371
372[[external-commands]]
373External Commands
374~~~~~~~~~~~~~~~~~
375
376Tig also comes with a few builtin external commands. These are simple shell
377commands that are run and can take arguments from the current browsing state,
378such as the current commit ID. The default commands are:
379
380`-------`--------------------------------------------------------------------
381Key Action
382-----------------------------------------------------------------------------
383C git cherry-pick %(commit)
384G git gc
385-----------------------------------------------------------------------------
386
387[[refspec]]
388Revision Specification
389----------------------
390
391This section describes various ways to specify what revisions to display or
392otherwise limit the view to. Tig does not itself parse the described
393revision options so refer to the relevant git man pages for further
394information. Relevant man pages besides git-log(1) are git-diff(1) and
395git-rev-list(1).
396
397You can tune the interaction with git by making use of the options explained
398in this section. For example, by configuring the environment variables
399described in the <<history-commands, "History commands">> section.
400
401[[path-limiting]]
402Limit by Path Name
403~~~~~~~~~~~~~~~~~~
404
405If you are interested only in those revisions that made changes to a specific
406file (or even several files) list the files like this:
407
408-----------------------------------------------------------------------------
409$ tig Makefile README
410-----------------------------------------------------------------------------
411
412To avoid ambiguity with tig's subcommands or repository references such as tag
413name, be sure to separate file names from other git options using "\--". So if
414you have a file named 'status' it will clash with the 'status' subcommand, and
415thus you will have to use:
416
417-----------------------------------------------------------------------------
418$ tig -- status
419-----------------------------------------------------------------------------
420
421NOTE: For the main view, avoiding ambiguity will in some cases require you to
422specify two "\--" options. The first will make tig stop option processing
423and the latter will be passed to git log.
424
425[[date-number-limiting]]
426Limit by Date or Number
427~~~~~~~~~~~~~~~~~~~~~~~
428
429To speed up interaction with git, you can limit the amount of commits to show
430both for the log and main view. Either limit by date using e.g.
431`--since=1.month` or limit by the number of commits using `-n400`.
432
433If you are only interested in changed that happened between two dates you can
434use:
435
436-----------------------------------------------------------------------------
437$ tig --after="May 5th" --before="2006-05-16 15:44"
438-----------------------------------------------------------------------------
439
440NOTE: If you want to avoid having to quote dates containing spaces you can use
441"." instead, e.g. `--after=May.5th`.
442
443[[commit-range-limiting]]
444Limiting by Commit Ranges
445~~~~~~~~~~~~~~~~~~~~~~~~~
446
447Alternatively, commits can be limited to a specific range, such as "all
448commits between 'tag-1.0' and 'tag-2.0'". For example:
449
450-----------------------------------------------------------------------------
451$ tig tag-1.0..tag-2.0
452-----------------------------------------------------------------------------
453
454This way of commit limiting makes it trivial to only browse the commits which
455haven't been pushed to a remote branch. Assuming 'origin' is your upstream
456remote branch, using:
457
458-----------------------------------------------------------------------------
459$ tig origin..HEAD
460-----------------------------------------------------------------------------
461
462will list what will be pushed to the remote branch. Optionally, the ending
463'HEAD' can be left out since it is implied.
464
465[[reachability-limiting]]
466Limiting by Reachability
467~~~~~~~~~~~~~~~~~~~~~~~~
468
469Git interprets the range specifier "tag-1.0..tag-2.0" as "all commits
470reachable from 'tag-2.0' but not from 'tag-1.0'". Where reachability refers
471to what commits are ancestors (or part of the history) of the branch or tagged
472revision in question.
473
474If you prefer to specify which commit to preview in this way use the
475following:
476
477-----------------------------------------------------------------------------
478$ tig tag-2.0 ^tag-1.0
479-----------------------------------------------------------------------------
480
481You can think of '^' as a negation operator. Using this alternate syntax, it
482is possible to further prune commits by specifying multiple branch cut offs.
483
484[[refspec-combi]]
485Combining Revisions Specification
486~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
487
488Revisions options can to some degree be combined, which makes it possible to
489say "show at most 20 commits from within the last month that changed files
490under the Documentation/ directory."
491
492-----------------------------------------------------------------------------
493$ tig --since=1.month -n20 -- Documentation/
494-----------------------------------------------------------------------------
495
496[[refspec-all]]
497Examining All Repository References
498~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
499
500In some cases, it can be useful to query changes across all references in a
501repository. An example is to ask "did any line of development in this
502repository change a particular file within the last week". This can be
503accomplished using:
504
505-----------------------------------------------------------------------------
506$ tig --all --since=1.week -- Makefile
507-----------------------------------------------------------------------------
508
509include::BUGS[]
510
511[[copy-right]]
512Copyright
513---------
514
515Copyright (c) 2006-2007 Jonas Fonseca <fonseca@diku.dk>
516
517This program is free software; you can redistribute it and/or modify
518it under the terms of the GNU General Public License as published by
519the Free Software Foundation; either version 2 of the License, or
520(at your option) any later version.
521
522[[references]]
523References and Related Tools
524----------------------------
525
526Manpages:
527
528 - gitlink:tig[1]
529 - gitlink:tigrc[5]
530
531Online resources:
532
533include::SITES[]
534
535Other git repository browsers:
536
537 - gitk(1)
538 - qgit(1)
539 - gitview(1)