Fixed displaying local tags.
[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
173d76ea
JF
213The status view::
214 Displays status of files in the working tree and allows changes to be
215 staged/unstaged as well as adding of untracked files.
216
f9a044a4
JF
217The stage view::
218 Displays diff changes for staged or unstanged files being tracked or
219 file content of untracked files.
220
d839253b
JF
221The pager view::
222 Is used for displaying both input from stdin and output from git
223 commands entered in the internal prompt.
224
225The help view::
24b5b3e0 226 Displays key binding quick reference.
d839253b 227
9783cb12 228[[title-window]]
d839253b
JF
229Title Windows
230~~~~~~~~~~~~~
231
232Each view has a title window which shows the name of the view, current commit
233ID if available, and where the view is positioned:
234
511147de
JF
235-----------------------------------------------------------------------------
236[main] c622eefaa485995320bc743431bae0d497b1d875 - commit 1 of 61 (1%)
237-----------------------------------------------------------------------------
d839253b
JF
238
239By default, the title of the current view is highlighted using bold font. For
240long loading views (taking over 3 seconds) the time since loading started will
241be appended:
242
511147de
JF
243-----------------------------------------------------------------------------
244[main] 77d9e40fbcea3238015aea403e06f61542df9a31 - commit 1 of 779 (0%) 5s
245-----------------------------------------------------------------------------
d839253b 246
9783cb12 247[[keys]]
669b0c34
JF
248Default Keybindings
249-------------------
d839253b
JF
250Below the default key bindings are shown.
251
9783cb12 252[[view-switching]]
d839253b
JF
253View Switching
254~~~~~~~~~~~~~~
669b0c34
JF
255
256`-------`--------------------------------------------------------------------
257Key Action
258-----------------------------------------------------------------------------
259m Switch to main view.
260d Switch to diff view.
261l Switch to log view.
262p Switch to pager view.
3360f449 263t Switch to (directory) tree view.
0001fc34 264f Switch to (file) blob view.
173d76ea
JF
265h Switch to help view
266S Switch to status view
f9a044a4 267c Switch to stage view
669b0c34 268-----------------------------------------------------------------------------
d839253b 269
9783cb12 270[[view-manipulation]]
d839253b
JF
271View Manipulation
272~~~~~~~~~~~~~~~~~
669b0c34
JF
273
274`-------`--------------------------------------------------------------------
275Key Action
276-----------------------------------------------------------------------------
277q Close view, if multiple views are open it will jump back to the \
278 previous view in the view stack. If it is the last open view it \
d839253b 279 will quit. Use 'Q' to quit all views at once.
669b0c34
JF
280Enter This key is "context sensitive" depending on what view you are \
281 currently in. When in log view on a commit line or in the main \
282 view, split the view and show the commit diff. In the diff view \
d839253b 283 pressing Enter will simply scroll the view one line down.
669b0c34 284Tab Switch to next view.
272818ea 285R Reload and refresh the current view.
669b0c34 286Up This key is "context sensitive" and will move the cursor one \
f7ffec06 287 line up. However, if you opened a diff view from the main view \
669b0c34
JF
288 (split- or full-screen) it will change the cursor to point to \
289 the previous commit in the main view and update the diff view \
d839253b 290 to display it.
669b0c34
JF
291Down Similar to 'Up' but will move down.
292-----------------------------------------------------------------------------
d839253b 293
9783cb12 294[[cursor-nav]]
d839253b
JF
295Cursor Navigation
296~~~~~~~~~~~~~~~~~
669b0c34
JF
297
298`-------`--------------------------------------------------------------------
299Key Action
300-----------------------------------------------------------------------------
301j Move cursor one line up.
302k Move cursor one line down.
03e8d891
JF
303PgUp,\
304-,a Move cursor one page up.
669b0c34
JF
305PgDown Space Move cursor one page down.
306Home Jump to first line.
307End Jump to last line.
308-----------------------------------------------------------------------------
d839253b 309
9783cb12 310[[view-scrolling]]
d839253b
JF
311Scrolling
312~~~~~~~~~
669b0c34
JF
313
314`-------`--------------------------------------------------------------------
315Key Action
316-----------------------------------------------------------------------------
317Insert Scroll view one line up.
318Delete Scroll view one line down.
319w Scroll view one page up.
320s Scroll view one page down.
321-----------------------------------------------------------------------------
d839253b 322
4af34daa
JF
323[[searching]]
324Searching
325~~~~~~~~~
326
327`-------`--------------------------------------------------------------------
328Key Action
329-----------------------------------------------------------------------------
330/ Search the view. Opens a prompt for entering search regex to use.
331? Search backwards in the view. Also prompts for regex.
332n Find next match for the current search regex.
333N Find previous match for the current search regex.
334-----------------------------------------------------------------------------
335
9783cb12 336[[misc-keys]]
d839253b
JF
337Misc
338~~~~
669b0c34
JF
339
340`-------`--------------------------------------------------------------------
341Key Action
342-----------------------------------------------------------------------------
343Q Quit.
344r Redraw screen.
345z Stop all background loading. This can be useful if you use \
346 tig in a repository with a long history without limiting \
d839253b 347 the revision log.
669b0c34 348v Show version.
904e68d8 349'.' Toggle line numbers on/off.
823057f4
DV
350D Toggle date display on/off.
351A Toggle author display on/off.
669b0c34 352g Toggle revision graph visualization on/off.
823057f4 353F Toggle reference display on/off (tag and branch names).
669b0c34
JF
354':' Open prompt. This allows you to specify what git command \
355 to run. Example `:log -p`
f9a044a4
JF
356u Update status of file. In the status view, this allows you to add an \
357 untracked file or stage changes to a file for next commit (similar to \
358 running git-add <filename>). In the stage view, when pressing this on \
359 a diff chunk line stages only that chunk for next commit, when not on \
360 a diff chunk line all changes in the displayed diff is staged.
b5c18d9d
JF
361M Resolve unmerged file by launching git-mergetool(1). Note, to work \
362 correctly this might require some initial configuration of your \
363 preferred merge tool. See the manpage of git-mergetool(1).
c509eed2
DV
364',' Move tree view to the parent tree.
365e Open file in editor.
669b0c34 366-----------------------------------------------------------------------------
d839253b 367
f655964f
JF
368[[external-commands]]
369External Commands
370~~~~~~~~~~~~~~~~~
371
372Tig also comes with a few builtin external commands. These are simple shell
373commands that are run and can take arguments from the current browsing state,
374such as the current commit ID. The default commands are:
375
376`-------`--------------------------------------------------------------------
377Key Action
378-----------------------------------------------------------------------------
379C git cherry-pick %(commit)
380G git gc
381-----------------------------------------------------------------------------
382
d839253b
JF
383[[refspec]]
384Revision Specification
385----------------------
386
387This section describes various ways to specify what revisions to display or
511147de 388otherwise limit the view to. Tig does not itself parse the described
f7ffec06 389revision options so refer to the relevant git man pages for further
d839253b
JF
390information. Relevant man pages besides git-log(1) are git-diff(1) and
391git-rev-list(1).
392
393You can tune the interaction with git by making use of the options explained
394in this section. For example, by configuring the environment variables
395described in the <<history-commands, "History commands">> section.
396
9783cb12 397[[path-limiting]]
d839253b
JF
398Limit by Path Name
399~~~~~~~~~~~~~~~~~~
400
401If you are interested only in those revisions that made changes to a specific
402file (or even several files) list the files like this:
403
511147de 404-----------------------------------------------------------------------------
77452abc 405$ tig Makefile README
511147de 406-----------------------------------------------------------------------------
d839253b 407
77452abc
JF
408To avoid ambiguity with tig's subcommands or repository references such as tag
409name, be sure to separate file names from other git options using "\--". So if
410you have a file named 'status' it will clash with the 'status' subcommand, and
411thus you will have to use:
d839253b 412
511147de 413-----------------------------------------------------------------------------
77452abc 414$ tig -- status
511147de 415-----------------------------------------------------------------------------
d839253b
JF
416
417NOTE: For the main view, avoiding ambiguity will in some cases require you to
511147de 418specify two "\--" options. The first will make tig stop option processing
d839253b
JF
419and the latter will be passed to git log.
420
9783cb12 421[[date-number-limiting]]
d839253b
JF
422Limit by Date or Number
423~~~~~~~~~~~~~~~~~~~~~~~
424
425To speed up interaction with git, you can limit the amount of commits to show
426both for the log and main view. Either limit by date using e.g.
427`--since=1.month` or limit by the number of commits using `-n400`.
428
429If you are only interested in changed that happened between two dates you can
430use:
431
511147de 432-----------------------------------------------------------------------------
77452abc 433$ tig --after="May 5th" --before="2006-05-16 15:44"
511147de 434-----------------------------------------------------------------------------
d839253b
JF
435
436NOTE: If you want to avoid having to quote dates containing spaces you can use
437"." instead, e.g. `--after=May.5th`.
438
9783cb12 439[[commit-range-limiting]]
d839253b
JF
440Limiting by Commit Ranges
441~~~~~~~~~~~~~~~~~~~~~~~~~
442
443Alternatively, commits can be limited to a specific range, such as "all
444commits between 'tag-1.0' and 'tag-2.0'". For example:
445
511147de 446-----------------------------------------------------------------------------
77452abc 447$ tig tag-1.0..tag-2.0
511147de 448-----------------------------------------------------------------------------
d839253b
JF
449
450This way of commit limiting makes it trivial to only browse the commits which
451haven't been pushed to a remote branch. Assuming 'origin' is your upstream
452remote branch, using:
453
511147de 454-----------------------------------------------------------------------------
77452abc 455$ tig origin..HEAD
511147de 456-----------------------------------------------------------------------------
d839253b
JF
457
458will list what will be pushed to the remote branch. Optionally, the ending
459'HEAD' can be left out since it is implied.
460
9783cb12 461[[reachability-limiting]]
d839253b
JF
462Limiting by Reachability
463~~~~~~~~~~~~~~~~~~~~~~~~
464
465Git interprets the range specifier "tag-1.0..tag-2.0" as "all commits
466reachable from 'tag-2.0' but not from 'tag-1.0'". Where reachability refers
467to what commits are ancestors (or part of the history) of the branch or tagged
468revision in question.
469
470If you prefer to specify which commit to preview in this way use the
471following:
472
511147de 473-----------------------------------------------------------------------------
77452abc 474$ tig tag-2.0 ^tag-1.0
511147de 475-----------------------------------------------------------------------------
d839253b
JF
476
477You can think of '^' as a negation operator. Using this alternate syntax, it
478is possible to further prune commits by specifying multiple branch cut offs.
479
9783cb12 480[[refspec-combi]]
d839253b
JF
481Combining Revisions Specification
482~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
483
484Revisions options can to some degree be combined, which makes it possible to
485say "show at most 20 commits from within the last month that changed files
486under the Documentation/ directory."
487
511147de 488-----------------------------------------------------------------------------
77452abc 489$ tig --since=1.month -n20 -- Documentation/
511147de 490-----------------------------------------------------------------------------
d839253b 491
9783cb12 492[[refspec-all]]
d839253b
JF
493Examining All Repository References
494~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
495
496In some cases, it can be useful to query changes across all references in a
497repository. An example is to ask "did any line of development in this
498repository change a particular file within the last week". This can be
499accomplished using:
500
511147de 501-----------------------------------------------------------------------------
77452abc 502$ tig --all --since=1.week -- Makefile
511147de 503-----------------------------------------------------------------------------
d839253b
JF
504
505include::BUGS[]
506
9783cb12 507[[copy-right]]
d839253b
JF
508Copyright
509---------
510
f9a044a4 511Copyright (c) 2006-2007 Jonas Fonseca <fonseca@diku.dk>
d839253b
JF
512
513This program is free software; you can redistribute it and/or modify
514it under the terms of the GNU General Public License as published by
515the Free Software Foundation; either version 2 of the License, or
516(at your option) any later version.
517
9783cb12 518[[references]]
d839253b
JF
519References and Related Tools
520----------------------------
521
511147de
JF
522Manpages:
523
524 - gitlink:tig[1]
525 - gitlink:tigrc[5]
526
527Online resources:
528
d839253b
JF
529include::SITES[]
530
d839253b
JF
531Other git repository browsers:
532
533 - gitk(1)
534 - qgit(1)
535 - gitview(1)